rack-scaffold 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef91f24e25308a80570de00566258b1f6dd8ba3
-  data.tar.gz: 044364fe5fca8ce8bfe21d4ca62f34201b5f2d3b
+  metadata.gz: 5d2030b9f5a66a76fcf8f658cf0a83ace7717130
+  data.tar.gz: 24a2f01f229584c7482511deb05f38aba9dfe57a
 SHA512:
-  metadata.gz: 57c614e8c131c3f8b0aef53b3a2f5b6d4d9ea991ae251e0c4d11623f68a85398920fa5a6e5c139c08dec42bf85dc328a85887305dceb61a9208da601c737e961
-  data.tar.gz: d2c028e14bd9dd1dc82cc1cdd5be3c216cbbcebef372c9f5c6c1fde50ba2b299bfb08e6ae97fe0db033b6a28722a9e5c311d8a4cb275f9012aafbf8cca6b54ee
+  metadata.gz: bc643c54ef2aabd7d762fdcae13e40a32e63bdba17dadf4b725cf1b23a04e599cba2ce95e0948f56d2b7c4249a8cca56eabd6c7caa9e732ab59ea58799078508
+  data.tar.gz: d07c15033d0195bdf70381e47c64ecda1fbb818e00aa5d24676014e684b215cb31d7435248c96ac7c05279c5329c490fbf413b48fcfd076dbdc93363d3f399a1

data/Gemfile

@@ -1,3 +1,4 @@
+ruby '2.0.0'
 source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-scaffold (0.1.0)
+    rack-scaffold (0.2.0)
       activesupport (>= 3.0)
       rack (~> 1.4)
       rack-contrib (~> 1.1)
@@ -12,47 +12,73 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.10)
-    backports (3.3.3)
-    eventmachine (1.0.3)
-    i18n (0.6.4)
-    minitest (4.7.5)
-    multi_json (1.7.7)
+      tzinfo (~> 1.1)
+    backports (3.6.0)
+    core_data (0.1.1)
+      nokogiri (~> 1.4)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    mini_portile (0.6.0)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.4)
-    sinatra (1.4.3)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    sequel (4.13.0)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.0)
+    sinatra-contrib (1.4.2)
       backports (>= 2.0)
-      eventmachine
+      multi_json
       rack-protection
       rack-test
-      sinatra (~> 1.4.2)
+      sinatra (~> 1.4.0)
       tilt (~> 1.3)
     sinatra-param (0.1.3)
       sinatra (~> 1.3)
-    thread_safe (0.1.2)
-      atomic
+    sqlite3 (1.3.9)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (0.3.37)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  core_data
+  database_cleaner
   rack-scaffold!
+  rack-test
   rake
+  rspec
+  sequel
+  sqlite3

data/lib/rack/scaffold.rb

@@ -29,6 +29,9 @@ module Rack
         end
 
         disable :raise_errors, :show_exceptions
+        if ENV["RACK_ENV"] == "test"
+          set :raise_errors, true
+        end
 
         def last_modified_time(resource, resources)
           update_timestamp_field = resource.update_timestamp_field.to_sym
@@ -41,7 +44,7 @@ module Rack
 
         def notify!(record)
           return unless @@connections
-          
+
           pathname = Pathname.new(request.path)
 
           lines = []
@@ -73,7 +76,7 @@ module Rack
           @@connections = Hash.new([])
 
           route :get, :subscribe, "/#{resource.plural}/?" do
-            pass unless request.accept? 'text/event-stream'
+            pass unless request.accept.include? 'text/event-stream'
 
             content_type 'text/event-stream'
 
@@ -89,7 +92,8 @@ module Rack
 
         @app.instance_eval do
           post "/#{resource.plural}/?" do
-            if record = resource.create!(params)
+            record = resource.klass.new(params)
+            if record.save
               status 201
               notify!(record)
               {"#{resource.singular}" => record}.to_json
@@ -142,7 +146,7 @@ module Rack
                 "#{association}" => associations
               }.to_json
             end
-          end          
+          end
         end if @actions.include?(:read)
 
         @app.instance_eval do

data/lib/rack/scaffold/adapters/core_data.rb

@@ -12,19 +12,17 @@ module Rack::Scaffold::Adapters
 
       def resources(xcdatamodel, options = {})
         model = ::CoreData::DataModel.new(xcdatamodel)
-        resources = model.entities.collect{|entity| resource = new(entity, options)}
         model.entities.each do |entity|
-          resources.each do |resource|
-            resource.establish_associations!(entity)
-          end
+          self.const_set(entity.name.capitalize, Class.new(::Sequel::Model)) unless self.const_defined?(entity.name.capitalize)
         end
 
-        return resources
+        model.entities.collect{|entity| new(entity, options)}
       end
     end
 
     def initialize(entity, options = {})
-      klass = Class.new(::Sequel::Model)
+      adapter = self.class
+      klass = adapter.const_get(entity.name.capitalize)
       klass.dataset = entity.name.downcase.pluralize.to_sym
 
       klass.class_eval do
@@ -42,14 +40,31 @@ module Rack::Scaffold::Adapters
           if options[:timestamps].instance_of? Hash
             plugin :timestamps, options[:timestamps]
           else
-            plugin :timestamps
+            plugin :timestamps, update_on_create: true
           end
         end
 
+        if options[:nested_attributes]
+          plugin :nested_attributes
+        end
+
         def url
           "/#{self.class.table_name}/#{self[primary_key]}"
         end
 
+        entity.relationships.each do |relationship|
+          entity_options = {class: adapter.const_get(relationship.destination.capitalize)}
+
+          if relationship.to_many?
+            one_to_many relationship.name.to_sym, entity_options
+            if options[:nested_attributes]
+              nested_attributes relationship.name.to_sym
+            end
+          else
+            many_to_one relationship.name.to_sym, options
+          end
+        end
+
         set_schema do
           primary_key :id
 
@@ -57,9 +72,9 @@ module Rack::Scaffold::Adapters
             next if attribute.transient?
 
             options = {
-              :null => attribute.optional?,
-              :index => attribute.indexed?,
-              :default => attribute.default_value
+              null: attribute.optional?,
+              index: attribute.indexed?,
+              default: attribute.default_value
             }
 
             type = case attribute.type
@@ -80,8 +95,8 @@ module Rack::Scaffold::Adapters
 
           entity.relationships.each do |relationship|
             options = {
-              :index => true,
-              :null => relationship.optional?
+              index: true,
+              null: relationship.optional?
             }
 
             if not relationship.to_many?
@@ -116,22 +131,7 @@ module Rack::Scaffold::Adapters
         end
       end
 
-      super(CoreData.const_set(entity.name, klass))
-    end
-
-    def establish_associations!(entity)
-      klass.class_eval do
-        entity.relationships.each do |relationship|
-          options = {:class => CoreData.const_get(relationship.destination.capitalize)}
-
-          options = {}
-          if relationship.to_many?
-            one_to_many relationship.name.to_sym, options
-          else
-            many_to_one relationship.name.to_sym, options
-          end
-        end
-      end
+      super(klass)
     end
   end
 end

data/rack-scaffold.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.email       = "m@mattt.me"
   s.homepage    = "http://mattt.me"
   s.license     = "MIT"
-  s.version     = "0.1.0"
+  s.version     = "0.2.0"
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Rack::Scaffold"
   s.description = "Automatically generate RESTful CRUD services"
@@ -20,6 +20,12 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", ">= 3.0"
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "sequel"
+  s.add_development_dependency "core_data"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "database_cleaner"
+  s.add_development_dependency "rack-test"
 
   s.files         = Dir["./**/*"].reject { |file| file =~ /\.\/(bin|example|log|pkg|script|spec|test|vendor)/ }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/scaffold/adapters/core_data_spec.rb

@@ -0,0 +1,150 @@
+require "spec_helper"
+
+describe Rack::Scaffold::Adapters::CoreData do
+  let(:app) { Rack::Scaffold.new(model: "./example/Example.xcdatamodeld") }
+  let(:adapter) { app.instance_variable_get("@adapter") }
+
+  describe "Artist" do
+    describe "collection" do
+      subject(:artists) { adapter::Artist.all }
+
+      it "is empty" do
+        is_expected.to be_empty
+      end
+
+      it "has an empty representation" do
+        get '/artists'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq({artists: []}.to_json)
+      end
+    end
+
+    describe "record" do
+      let(:attributes) {
+        {
+          name: "Serge Gainsbourg",
+          artistDescription: "Renowned for his often provocative and scandalous releases"
+        }
+      }
+
+      before { post '/artists', attributes }
+      subject(:artist) { adapter::Artist.first }
+
+      it do
+        expect(last_response.status).to eq(201)
+        expect(last_response.body).to eq({artist: artist}.to_json)
+      end
+
+      it "is not nil" do
+        is_expected.not_to be_nil
+      end
+
+      it "has attributes in response body" do
+        expect(last_response.body).to eq({artist: artist}.to_json)
+      end
+
+      it "has the correct attributes" do
+        expect(artist.name).to eq(attributes[:name])
+        expect(artist.artistDescription).to eq(attributes[:artistDescription])
+      end
+
+      it "is listed with GET request" do
+        get '/artists'
+        expect(last_response.body).to eq({artists: [artist]}.to_json)
+      end
+
+      it "is shown with GET request" do
+        get '/artists/1'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq({artist: artist}.to_json)
+      end
+
+      it "is updated with PUT request" do
+        name =  "Lucien"
+        put '/artists/1', name: name
+        expect(last_response.status).to eq(200)
+        expect(adapter::Artist.first.name).to eq(name)
+      end
+
+      it "is updated with PATCH request" do
+        name =  "Lucien"
+        patch '/artists/1', name: name
+        expect(last_response.status).to eq(200)
+        expect(adapter::Artist.first.name).to eq(name)
+      end
+
+      it "is deleted with DELETE request" do
+        delete "/artists/#{artist.id}"
+        expect(last_response.status).to eq(204)
+        expect(adapter::Artist.first(name: artist.name)).to be_nil
+      end
+    end
+  end
+
+  describe "Song" do
+    describe "collection" do
+      subject(:songs) { adapter::Song.all }
+
+      it "is empty" do
+        is_expected.to be_empty
+      end
+
+      it "has an empty representation" do
+        get '/songs'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq({songs: []}.to_json)
+      end
+    end
+
+    describe "record" do
+      let(:artist) { adapter::Artist.create() }
+
+      let(:attributes) {
+        {
+          title: "Black Trombone",
+          artist_id: artist.id
+        }
+      }
+
+      before { post '/songs', attributes }
+      subject(:song) { adapter::Song.first }
+
+      it do
+        expect(last_response.status).to eq(201)
+        expect(last_response.body).to eq({song: song}.to_json)
+      end
+
+      it "is listed with GET" do
+        get "/artists/#{artist.id}/songs"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq({songs: [song]}.to_json)
+      end
+
+      it "is shown with GET request" do
+        get "/songs/#{song.id}"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq({song: song}.to_json)
+      end
+
+      it "is updated with PUT request" do
+        title = "Je T'Aime....Moi Non Plus"
+        put "/songs/#{song.id}", title: title
+        expect(last_response.status).to eq(200)
+        expect(adapter::Song.first.title).to eq(title)
+      end
+
+      it "is updated with PATCH request" do
+        title = "Je T'Aime....Moi Non Plus"
+        patch "/songs/#{song.id}", title: title
+        expect(last_response.status).to eq(200)
+        expect(adapter::Song.first.title).to eq(title)
+      end
+
+      it "is deleted with DELETE request" do
+        delete "/songs/#{song.id}"
+        expect(last_response.status).to eq(204)
+        expect(adapter::Song.first(title: song.title)).to be_nil
+      end
+    end
+  end
+end

data/spec/scaffold/adapters_spec.rb

@@ -0,0 +1,4 @@
+require "spec_helper"
+
+describe Rack::Scaffold::Adapters do  
+end

data/spec/scaffold_spec.rb

@@ -0,0 +1,4 @@
+require "spec_helper"
+
+describe Rack::Scaffold do
+end

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+require "rubygems"
+require "bundler/setup"
+
+require "rack"
+require "rack/test"
+require "rspec"
+
+require "sqlite3"
+require "sequel"
+require "core_data"
+require "rack/scaffold"
+
+require "database_cleaner"
+
+DB = Sequel.sqlite
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+  config.color = true
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -108,6 +108,90 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: core_data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Automatically generate RESTful CRUD services
 email: m@mattt.me
 executables: []
@@ -122,9 +206,14 @@ files:
 - ./lib/rack/scaffold/adapters.rb
 - ./lib/rack/scaffold.rb
 - ./LICENSE
+- ./rack-scaffold-0.2.0.gem
 - ./rack-scaffold.gemspec
 - ./Rakefile
 - ./README.md
+- spec/scaffold/adapters/core_data_spec.rb
+- spec/scaffold/adapters_spec.rb
+- spec/scaffold_spec.rb
+- spec/spec_helper.rb
 homepage: http://mattt.me
 licenses:
 - MIT
@@ -145,8 +234,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Rack::Scaffold
-test_files: []
+test_files:
+- spec/scaffold/adapters/core_data_spec.rb
+- spec/scaffold/adapters_spec.rb
+- spec/scaffold_spec.rb
+- spec/spec_helper.rb