mopsled · December 23, 2016 05:36 · Feb 20, 2014 · Feb 23, 2013 · Jan 9, 2013 · Jan 9, 2013
diff --git a/server.rb b/server.rb
@@ -29,10 +29,10 @@
       selectedColor.name = params['name']
     end
     if params.has_key?('description')
-      selectedColor.name = params['description']
+      selectedColor.description = params['description']
     end
     if params.has_key?('value')
-      selectedColor.name = params['value']
+      selectedColor.value = params['value']
     end
     selectedColor.save
   end

diff --git a/server.rb b/server.rb
@@ -1,4 +1,4 @@
-require "sinatra"
+require 'sinatra'
 require 'active_record'
 require "./color.rb"
 

diff --git a/create-tables.rb b/create-tables.rb
@@ -6,6 +6,6 @@
   create_table :colors do |t|
     t.column :name, :string
     t.column :description, :string
-    t.column :color, :string
+    t.column :value, :string
   end
 end
diff --git a/server.rb b/server.rb
@@ -14,10 +14,10 @@
 end
 
 post '/color' do
-  if params.has_key?('name') and params.has_key?('description') and params.has_key?('color')
+  if params.has_key?('name') and params.has_key?('description') and params.has_key?('value')
     newColor = Color.new(:name => params['name'], 
       :description => params['description'], 
-      :color => params['color'])
+      :value => params['value'])
     newColor.save
   end
 end
@@ -31,8 +31,8 @@
     if params.has_key?('description')
       selectedColor.name = params['description']
     end
-    if params.has_key?('color')
-      selectedColor.name = params['color']
+    if params.has_key?('value')
+      selectedColor.name = params['value']
     end
     selectedColor.save
   end

diff --git a/server.rb b/server.rb
@@ -1,4 +1,5 @@
 require "sinatra"
+require 'active_record'
 require "./color.rb"
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'colors.db')

diff --git a/create-tables.rb b/create-tables.rb
@@ -1,3 +1,7 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'colors.db')
+
 ActiveRecord::Schema.define do
   create_table :colors do |t|
     t.column :name, :string

diff --git a/color.rb b/color.rb
@@ -0,0 +1,5 @@
+require 'active_record'
+
+class Color < ActiveRecord::Base
+
+end
diff --git a/create-tables.rb b/create-tables.rb
@@ -0,0 +1,7 @@
+ActiveRecord::Schema.define do
+  create_table :colors do |t|
+    t.column :name, :string
+    t.column :description, :string
+    t.column :color, :string
+  end
+end
diff --git a/server.rb b/server.rb
@@ -0,0 +1,42 @@
+require "sinatra"
+require "./color.rb"
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'colors.db')
+ActiveRecord::Base.include_root_in_json = false
+
+get '/colors' do
+  Color.all.to_json
+end
+
+get '/color/:id' do
+  Color.where(:id => params['id']).first.to_json
+end
+
+post '/color' do
+  if params.has_key?('name') and params.has_key?('description') and params.has_key?('color')
+    newColor = Color.new(:name => params['name'], 
+      :description => params['description'], 
+      :color => params['color'])
+    newColor.save
+  end
+end
+
+put '/color/:id' do
+  selectedColor = Color.where(:id => params['id']).first
+  if selectedColor
+    if params.has_key?('name')
+      selectedColor.name = params['name']
+    end
+    if params.has_key?('description')
+      selectedColor.name = params['description']
+    end
+    if params.has_key?('color')
+      selectedColor.name = params['color']
+    end
+    selectedColor.save
+  end
+end
+
+delete '/color/:id' do
+  Color.where(:id => params['id']).destroy_all
+end