nested 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 238405f893ac3d421bb7847af4cf7e9b7193d60b
-  data.tar.gz: c69edcdd615637531b1b590f3f724d233b366c37
+  metadata.gz: e2dc4320c86fbb50e5eb18ba56f3e0586eebdf59
+  data.tar.gz: 5a317c9502f9e660ff115d1ae2082427f8487651
 SHA512:
-  metadata.gz: bcc98a9dddd3ad23d069cd5247beea3a72e68a2f59907c6362b772952b04e608bd14d77afa592babdc4c026d701202d0c60cdebcc2b549fd5d6135324568f183
-  data.tar.gz: be247d2bb96f5b2b8518b6b2da5070cbdc006c37664b8573818f47e6e9c84e350870907a22b24fee088d6ee1cb48a8d244f563b07039d7a4838aa8c3f8f4acb7
+  metadata.gz: 8cee76f95bcb3362c969b6a4ed8521d23f5954fd2693b36be368a11fd90a917d1299a29ff517ceea4d244a63fe3985152461739ca0304726f98e0bf6765d86ca
+  data.tar.gz: e655d4103dbe7824ebd3c870f5a5d582fdc9f5fcad1acdd60026565569624c6d8b28d4f7964a63ad6cfbef0f8b0aec84b665d6c4f08ef33828ff5b3bda36e451

data/lib/nested/app.rb

@@ -2,11 +2,12 @@ module Nested
   class App
     def self.inherited(clazz)
       (class << clazz; self; end).instance_eval do
-        attr_accessor :sinatra, :behaviors
+        attr_accessor :sinatra, :behaviors, :conditions
       end
       clazz.sinatra = Class.new(Sinatra::Base)
       clazz.instance_variable_set("@config", {})
       clazz.instance_variable_set("@behaviors", {})
+      clazz.instance_variable_set("@conditions", {})
     end
 
     def self.behavior(name, &block)
@@ -14,6 +15,16 @@ module Nested
       self
     end
 
+    def self.condition(name, block)
+      @conditions[name] = block
+
+      @sinatra.send(:define_method, :"#{name}?") do
+        instance_exec(&block)
+      end
+
+      self
+    end
+
     def self.child_resource(name, clazz, resource_if_block, model_block, &block)
        clazz.new(self, sinatra, name, nil, resource_if_block, model_block)
             .tap{|r| r.instance_eval(&(block||Proc.new{ }))}

data/lib/nested/integration/angular.rb

@@ -43,15 +43,13 @@ module Nested
             js << "  }"
 
             if [:get, :delete].include?(method)
-              args << "data" if !block_args.empty?
-
-              js << "  impl.#{fun_name} = function(#{args.join(',')}){"
+              js << "  impl.#{fun_name} = function(#{(args + ['data']).join(',')}){"
               js << "    var deferred = $q.defer()"
               js << "    $q.all([#{when_args.join(',')}]).then(function(values){"
               js << "      $http({"
               js << "         method: '#{method}', "
-              js << ("         url: '#{route}'" + (block_args.empty? ? "" : ","))
-              js << "         params: data" unless block_args.empty?
+              js << "         url: '#{route}', "
+              js << "         params: data||{}"
               js << "      })"
               js << "        .success(function(responseData){"
               js << "           deferred[responseData.ok ? 'resolve' : 'reject'](responseData.data)"
@@ -60,6 +58,24 @@ module Nested
               js << "    });"
               js << "    return deferred.promise"
               js << "  }"
+
+              # args << "data" if !block_args.empty?
+
+              # js << "  impl.#{fun_name} = function(#{args.join(',')}){"
+              # js << "    var deferred = $q.defer()"
+              # js << "    $q.all([#{when_args.join(',')}]).then(function(values){"
+              # js << "      $http({"
+              # js << "         method: '#{method}', "
+              # js << ("         url: '#{route}'" + (block_args.empty? ? "" : ","))
+              # js << "         params: data" unless block_args.empty?
+              # js << "      })"
+              # js << "        .success(function(responseData){"
+              # js << "           deferred[responseData.ok ? 'resolve' : 'reject'](responseData.data)"
+              # js << "        })"
+              # js << "        .error(function(){ deferred.reject() })"
+              # js << "    });"
+              # js << "    return deferred.promise"
+              # js << "  }"
             elsif method == :post
               js << "  impl.#{fun_name} = function(#{(args+['data']).join(',')}){"
               js << "    var deferred = $q.defer()"

data/lib/nested/many.rb

@@ -15,7 +15,7 @@ module Nested
     end
 
     def one_if(resource_if_block, &block)
-      child_resource(self.name.to_s.singularize.to_sym, One, resource_if_block, nil, &block)
+      child_resource(self.name.to_s.singularize.to_sym, One, resource_if_block.is_a?(Symbol) ? @app.conditions[resource_if_block] : resource_if_block, nil, &block)
     end
 
     def default_model_block

data/lib/nested/resource.rb

@@ -71,12 +71,12 @@ module Nested
     end
 
     def serialize_include_if(condition, *args)
-      args.each {|arg| @serializer + SerializerField.new(arg, condition) }
+      args.each {|arg| @serializer + SerializerField.new(arg, condition.is_a?(Symbol) ? @app.conditions[condition] : condition) }
       self
     end
 
     def serialize_exclude_if(condition, *args)
-      args.each {|arg| @serializer - SerializerField.new(arg, condition) }
+      args.each {|arg| @serializer - SerializerField.new(arg, condition.is_a?(Symbol) ? @app.conditions[condition] : condition) }
       self
     end
 
@@ -103,7 +103,7 @@ module Nested
         end
 
         define_method :"#{method}_if" do |method_if_block, action=nil, &block|
-          create_sinatra_route method, action, method_if_block, &(block||proc {})
+          create_sinatra_route method, action, method_if_block.is_a?(Symbol) ? @app.conditions[method_if_block] : method_if_block, &(block||proc {})
           self
         end
       end
@@ -155,36 +155,37 @@ module Nested
     end
 
     def sinatra_exec_get_block(sinatra, &block)
-      sinatra_init_data(:get, sinatra, &block)
+      # sinatra_init_data(:get, sinatra, &block)
       sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
     end
 
     def sinatra_exec_delete_block(sinatra, &block)
-      sinatra_init_data(:delete, sinatra, &block)
+      # sinatra_init_data(:delete, sinatra, &block)
       sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
     end
 
-    def sinatra_init_data(method, sinatra, &block)
-      raw_data = if [:put, :post].include?(method)
-        sinatra.request.body.rewind
-        HashWithIndifferentAccess.new(JSON.parse(sinatra.request.body.read))
-      elsif [:get, :delete].include?(method)
-        sinatra.params
-      else
-        {}
-      end
+    # def sinatra_init_data(method, sinatra, &block)
+    #   raw_data = if [:put, :post].include?(method)
+    #     sinatra.request.body.rewind
+    #     body = sinatra.request.body.read
+    #     HashWithIndifferentAccess.new(JSON.parse(body))
+    #   elsif [:get, :delete].include?(method)
+    #     sinatra.params
+    #   else
+    #     {}
+    #   end
 
-      sinatra.instance_variable_set("@__raw_data", raw_data)
-      sinatra.instance_variable_set("@__data", raw_data.values_at(*block.parameters.map(&:last)))
-    end
+    #   sinatra.instance_variable_set("@__raw_data", raw_data)
+    #   sinatra.instance_variable_set("@__data", raw_data.values_at(*block.parameters.map(&:last)))
+    # end
 
     def sinatra_exec_put_block(sinatra, &block)
-      sinatra_init_data(:put, sinatra, &block)
+      # sinatra_init_data(:put, sinatra, &block)
       sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
     end
 
     def sinatra_exec_post_block(sinatra, &block)
-      sinatra_init_data(:post, sinatra, &block)
+      # sinatra_init_data(:post, sinatra, &block)
       res = sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
       sinatra.instance_variable_set("@#{self.instance_variable_name}", res)
       # TODO: do we need to check for existing variables here?
@@ -240,6 +241,20 @@ module Nested
       {data: sinatra_errors_to_hash(errors), ok: false}
     end
 
+    def sinatra_init_data_extract_body(sinatra)
+      JSON.parse(sinatra.request.body.read)
+    end
+
+    def sinatra_init_data(sinatra, method, &block)
+      if [:put, :post].include?(method)
+        sinatra.request.body.rewind
+        sinatra.params.merge! HashWithIndifferentAccess.new(sinatra_init_data_extract_body(sinatra))
+      end
+
+      sinatra.instance_variable_set("@__raw_data", HashWithIndifferentAccess.new(sinatra.params))
+      sinatra.instance_variable_set("@__data", HashWithIndifferentAccess.new(sinatra.params).values_at(*block.parameters.map(&:last)))
+    end
+
     def create_sinatra_route(method, action, method_if_block, &block)
       @actions << {method: method, action: action, block: block}
 
@@ -259,6 +274,8 @@ module Nested
         begin
           content_type :json
 
+          resource.sinatra_init_data(self, method, &block)
+
           resource.self_and_parents.reverse.each do |res|
             res.sinatra_init(self)
           end
@@ -273,21 +290,31 @@ module Nested
           context_arr << "route: #{route}"
           context_arr << "method: #{method}"
           context_arr << "action: #{action}"
+          context_arr << "params: #{params.inspect}"
+          context_arr << "__raw_data: #{@__raw_data.inspect}"
+          context_arr << "__data: #{@__data.inspect}"
+
 
           context_arr << "resource: #{resource.name} (#{resource.class.name})"
           resource_object = instance_variable_get("@#{resource.instance_variable_name}")
           context_arr << "@#{resource.instance_variable_name}: #{resource_object.inspect}"
 
-          parent = resource.try(:parent)
-
-          if parent
+          resource.parents.each do |parent|
             context_arr << "parent: #{parent.name} (#{parent.class.name})"
             parent_object = instance_variable_get("@#{parent.instance_variable_name}")
             context_arr << "@#{parent.instance_variable_name}: #{parent_object.inspect}"
           end
 
+          # parent = resource.try(:parent)
+
+          # if parent
+          #   context_arr << "parent: #{parent.name} (#{parent.class.name})"
+          #   parent_object = instance_variable_get("@#{parent.instance_variable_name}")
+          #   context_arr << "@#{parent.instance_variable_name}: #{parent_object.inspect}"
+          # end
+
           puts context_arr.join("\n")
-          raise e
+          puts e.message
         end
       end
     end

data/lib/nested/with_many.rb

@@ -5,7 +5,7 @@ module Nested
     end
 
     def many_if(resource_if_block, name, model_block=nil, &block)
-      child_resource(name, Many, resource_if_block, model_block, &block)
+      child_resource(name, Many, resource_if_block.is_a?(Symbol) ? @app.conditions[resource_if_block] : resource_if_block, model_block, &block)
     end
   end
 end

data/lib/nested/with_model_block.rb

@@ -1,6 +1,6 @@
 module Nested
   module WithModelBlock
-    def model(&block)
+    def model(block)
       raise "do not use model() when you already set a model block" if @model_block != default_model_block && @model_block != Nested::PROC_NIL
       @model_block = block
       self

data/lib/nested/with_singleton.rb

@@ -5,7 +5,7 @@ module Nested
     end
 
     def singleton_if(resource_if_block, name, model_block=nil, &block)
-      child_resource(name, Singleton, resource_if_block, model_block, &block)
+      child_resource(name, Singleton, resource_if_block.is_a?(Symbol) ? @app.conditions[resource_if_block] : resource_if_block, model_block, &block)
     end
   end
 end

data/nested.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name               = "nested"
-  s.version            = "0.0.29"
+  s.version            = "0.0.30"
 
   s.authors = ["Jan Zimmek"]
   s.email = %q{jan.zimmek@web.de}

data/test/app_test.rb

@@ -27,6 +27,11 @@ class NestedTest < Test::Unit::TestCase
     assert_equal ({:test => b}), app.behavior(:test, &b).instance_variable_get("@behaviors")
   end
 
+  def test_condition
+    b = ->{}
+    assert_equal ({:test => b}), app.condition(:test, b).instance_variable_get("@conditions")
+  end
+
   def test__before
     a = app
 

data/test/nested_test.rb

@@ -73,7 +73,7 @@ class NestedTest < Test::Unit::TestCase
   def test_model_block
     model_block = ->{ }
     r = singleton(:project)
-    assert_equal r, r.model(&model_block)
+    assert_equal r, r.model(model_block)
     assert_equal model_block, r.model_block
   end
 
@@ -435,12 +435,21 @@ class NestedTest < Test::Unit::TestCase
   def test_model
     model_block = ->{}
     r = singleton(:project)
-    assert_equal r, r.model(&model_block)
+    assert_equal r, r.model(model_block)
     assert_equal model_block, r.instance_variable_get("@model_block")
 
     assert_raise RuntimeError do
-      singleton(:project, ->{ 10 }).model(&->{ 20 })
+      singleton(:project, ->{ 10 }).model(->{ 20 })
     end
+
+    many(:projects, nil).model(model_block)
   end
 
+  # def test_conditions
+  #   r = singleton(:project)
+  #   app = r.instance_variable_get("@app")
+  #   app.condition :mycondition, ->{ true }
+  #   assert_equal true, app.sinatra.new.mycondition?
+  # end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport