rack-scaffold 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62eaf4d70bb8f5ffe5b174b33713b1ebeae39bc5
-  data.tar.gz: 60452a102b8b505f53dfdc1a6ef2b32a56931ccf
+  metadata.gz: 2e321a350a25a6a2fe7440f27ec0e26dbdf6dcb4
+  data.tar.gz: d2a63d3b802a9d78efc70f0d2f92feef62dce3dc
 SHA512:
-  metadata.gz: 5f9b7caa071e3813f3b0115e68db9ada8c116f57d5283594d3c6811a84faed2781a745ea1866dea66d722d3d9121058cd6f4f78c16c8dcf5009c3990fd51604d
-  data.tar.gz: 36a22a42bbd975c11cfec13ca44f239774061b8a8a7115eeda608bf96031b84ec74813a7eddc113d72cbac3d1ec125cb1f1e43ee2171c4c578dae97ac351bc09
+  metadata.gz: d4bd26aa4a6313a847622a635b5da6d5bf575734092548d75581a8d7806f3a8c872d17495831f9ade59323c424114ba6f1a32a0497cab9f9c03d1dcfe81c5435
+  data.tar.gz: d9abfdd3d3bc747130d937a44cbdafcc701f4d127fcddacbe036e0c10e8ba8fefc0ee81f02cc67172a5c548231a16ba7f9ec8e34eb487415beaf449493344575

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-scaffold (0.0.1)
+    rack-scaffold (0.0.2)
       activesupport (>= 3.0)
       rack (~> 1.4)
       rack-contrib (~> 1.1)
@@ -15,7 +15,7 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     i18n (0.6.1)
-    multi_json (1.7.2)
+    multi_json (1.7.3)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
@@ -26,9 +26,9 @@ GEM
       rack (~> 1.5, >= 1.5.2)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sinatra-param (0.1.2)
+    sinatra-param (0.1.3)
       sinatra (~> 1.3)
-    tilt (1.3.7)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby

data/lib/rack/scaffold.rb

@@ -3,7 +3,6 @@ require 'rack/contrib'
 require 'sinatra/base'
 require 'sinatra/param'
 
-require 'rack/scaffold/version'
 require 'rack/scaffold/adapters'
 
 module Rack
@@ -26,6 +25,15 @@ module Rack
         end
 
         disable :raise_errors, :show_exceptions
+
+        def last_modified_time(resource, resources)
+          update_timestamp_field = resource.update_timestamp_field.to_sym
+          most_recently_updated = resources.class.include?(Enumerable) ? resources.max_by(&update_timestamp_field) : resources
+
+          timestamp = request.env['HTTP_IF_MODIFIED_SINCE']
+          timestamp = most_recently_updated.send(update_timestamp_field) if most_recently_updated
+          timestamp
+        end
       end
 
       @actions = (options[:only] || ACTIONS) - (options[:except] || [])
@@ -33,13 +41,13 @@ module Rack
       @adapter = Rack::Scaffold.adapters.detect{|adapter| adapter === options[:model]}
       raise "No suitable adapters found for #{options[:model]} in #{Rack::Scaffold.adapters}" unless @adapter
 
-      resources = Array(@adapter.resources(options[:model]))
+      resources = Array(@adapter.resources(options[:model], options))
       resources.each do |resource|
         @app.instance_eval do
           post "/#{resource.plural}/?" do
             if record = resource.create!(params)
               status 201
-              {entity.name.downcase => record}.to_json
+              {"#{resource.singular}" => record}.to_json
             else
               status 406
               {errors: record.errors}.to_json
@@ -53,8 +61,11 @@ module Rack
               param :page, Integer, default: 1, min: 1
               param :per_page, Integer, default: 100, in: (1..100)
 
+              resources = resource.paginate(params[:per_page], (params[:page] - 1) * params[:per_page])
+              last_modified(last_modified_time(resource, resources)) if resource.timestamps?
+
               {
-                "#{resource.plural}" => resource.paginate(params[:per_page], (params[:page] - 1) * params[:per_page]),
+                "#{resource.plural}" => resources,
                 page: params[:page],
                 total: resource.count
               }.to_json
@@ -62,16 +73,21 @@ module Rack
               param :limit, Integer, default: 100, in: (1..100)
               param :offset, Integer, default: 0, min: 0
 
+              resources = resource.paginate(params[:limit], params[:offset])
+              last_modified(last_modified_time(resource, resources)) if resource.timestamps?
+
               {
-                "#{resource.plural}" => resource.paginate(params[:limit], params[:offset])
+                "#{resource.plural}" => resources
               }.to_json
             end
           end
 
           get "/#{resource.plural}/:id/?" do
             record = resource[params[:id]] or halt 404
-            {entity.name.downcase => record}.to_json
+            last_modified(last_modified_time(resource, record)) if resource.timestamps?
+            {"#{resource.singular}" => record}.to_json
           end
+
         end if @actions.include?(:read)
 
         @app.instance_eval do
@@ -79,7 +95,7 @@ module Rack
             record = resource[params[:id]] or halt 404
             if record.update!(params)
               status 200
-              {entity.name.downcase => record}.to_json
+              {"#{resource.singular}" => record}.to_json
             else
               status 406
               {errors: record.errors}.to_json
@@ -97,7 +113,7 @@ module Rack
               {errors: record.errors}.to_json
             end
           end
-        end if @actions.include?(:delete)
+        end if @actions.include?(:destroy)
 
         # @app.instance_eval do
         #   entity.relationships.each do |relationship|

data/lib/rack/scaffold/adapters.rb

@@ -20,7 +20,7 @@ module Rack
             raise NotImplementedError
           end
 
-          def resources(model)
+          def resources(model, options = {})
             raise NotImplementedError
           end
         end
@@ -68,6 +68,14 @@ module Rack
         def destroy!
           raise NotImplementedError
         end
+
+        def timestamps?
+          raise NotImplementedError
+        end
+
+        def update_timestamp_field
+          raise NotImplementedError
+        end
       end
     end
   end

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

@@ -12,9 +12,13 @@ module Rack::Scaffold::Adapters
         ::ActiveRecord::Base === model
       end
 
-      def resources(model)
+      def resources(model, options = {})
         model
       end
+
+      def timestamps?
+        record_timestamps?
+      end
     end
 
     def singular
@@ -32,5 +36,9 @@ module Rack::Scaffold::Adapters
     def [](id)
       self.find(id)
     end
+
+    def update_timestamp_field
+      self.attribute_names.include?("updated_at") ? "updated_at" : "updated_on"
+    end
   end
 end

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

@@ -10,13 +10,13 @@ module Rack::Scaffold::Adapters
         !! ::CoreData::DataModel.new(model) rescue false
       end
 
-      def resources(xcdatamodel)
+      def resources(xcdatamodel, options = {})
         model = ::CoreData::DataModel.new(xcdatamodel)
-        model.entities.collect{|entity| new(entity)}
+        model.entities.collect{|entity| new(entity, options)}
       end
     end
 
-    def initialize(entity)
+    def initialize(entity, options = {})
       klass = Class.new(::Sequel::Model)
       klass.dataset = entity.name.downcase.pluralize.to_sym
 
@@ -28,6 +28,15 @@ module Rack::Scaffold::Adapters
         plugin :schema
         plugin :validation_helpers
 
+        if options[:timestamps]
+          if options[:timestamps].instance_of? Hash
+            plugin :timestamps, options[:timestamps]
+          else
+            plugin :timestamps
+          end
+#          plugin :timestamps, create: :createdAt, update: :updatedAt
+        end
+
         def url
           "/#{self.class.table_name}/#{self[primary_key]}"
         end
@@ -55,16 +64,16 @@ module Rack::Scaffold::Adapters
             }
 
             type = case attribute.type
-                    when "Integer 16" then :int2
-                    when "Integer 32" then :int4
-                    when "Integer 64" then :int8
-                    when "Float" then :float4
-                    when "Double" then :float8
-                    when "Decimal" then :float8
-                    when "Date" then :timestamp
-                    when "Boolean" then :boolean
-                    when "Binary" then :bytea
-                    else :varchar
+                   when "Integer 16" then :int2
+                   when "Integer 32" then :int4
+                   when "Integer 64" then :int8
+                   when "Float" then :float4
+                   when "Double" then :float8
+                   when "Decimal" then :float8
+                   when "Date" then :timestamp
+                   when "Boolean" then :boolean
+                   when "Binary" then :bytea
+                   else :varchar
                    end
 
             column attribute.name.to_sym, type, options
@@ -97,18 +106,19 @@ module Rack::Scaffold::Adapters
       klass.send :define_method, :validate do
         entity.attributes.each do |attribute|
           case attribute.type
-            when "Integer 16", "Integer 32", "Integer 64"
-              validates_integer attribute.name
-            when "Float", "Double", "Decimal"
-              validates_numeric attribute.name
-            when "String"
-              validates_min_length attribute.minimum_value, attribute.name if attribute.minimum_value
-              validates_max_length attribute.maximum_value, attribute.name if attribute.maximum_value
-           end
+          when "Integer 16", "Integer 32", "Integer 64"
+            validates_integer attribute.name
+          when "Float", "Double", "Decimal"
+            validates_numeric attribute.name
+          when "String"
+            validates_min_length attribute.minimum_value, attribute.name if attribute.minimum_value
+            validates_max_length attribute.maximum_value, attribute.name if attribute.maximum_value
+          end
         end
       end
 
-      super(klass)
+      
+      super(CoreData.const_set(entity.name, klass))
     end
   end
 end

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

@@ -5,20 +5,24 @@ module Rack::Scaffold::Adapters
   class Sequel < Base
     extend Forwardable
 
-    def_delegators :@klass, :count, :all, :find, :[], :create!, :update!, :destroy!
+    def_delegators :@klass, :count, :all, :find, :[], :update_timestamp_field
+    def_delegator :@klass, :create, :create!
+    def_delegator :@klass, :update, :update!
+    def_delegator :@klass, :destroy, :destroy!
 
     class << self
       def ===(model)
         ::Sequel::Model === model
       end
 
-      def resources(model)
+      def resources(model, options = {})
         model
       end
+
     end
 
     def singular
-      @klass.name
+      @klass.name.demodulize.downcase
     end
 
     def plural
@@ -28,5 +32,10 @@ module Rack::Scaffold::Adapters
     def paginate(limit, offset)
       @klass.limit(limit, offset)
     end
+
+    def timestamps?
+      defined?(::Sequel::Plugins::Timestamps) and @klass.plugins.include?(::Sequel::Plugins::Timestamps)
+    end
+
   end
 end

data/rack-scaffold.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "rack/scaffold/version"
 
 Gem::Specification.new do |s|
   s.name        = "rack-scaffold"
@@ -8,7 +7,7 @@ Gem::Specification.new do |s|
   s.email       = "m@mattt.me"
   s.homepage    = "http://mattt.me"
   s.license     = "MIT"
-  s.version     = Rack::Scaffold::VERSION
+  s.version     = "0.0.2"
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Rack::Scaffold"
   s.description = "Automatically generate RESTful CRUD services"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -106,9 +106,9 @@ files:
 - ./lib/rack/scaffold/adapters/core_data.rb
 - ./lib/rack/scaffold/adapters/sequel.rb
 - ./lib/rack/scaffold/adapters.rb
-- ./lib/rack/scaffold/version.rb
 - ./lib/rack/scaffold.rb
 - ./LICENSE
+- ./rack-scaffold-0.0.1.gem
 - ./rack-scaffold.gemspec
 - ./Rakefile
 - ./README.md

data/lib/rack/scaffold/version.rb

@@ -1,5 +0,0 @@
-module Rack
-  class Scaffold
-    VERSION = "0.0.1"
-  end
-end