json-crud-api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 430c16f0ea6b1cf7518272fcc815420c1f434754
-  data.tar.gz: 52f57a32ff4e26a2e7038a1fa6c6134569dd0e78
+  metadata.gz: b011194209c43c09fab09e549d9e88b12854f4ff
+  data.tar.gz: 7a62d339247b3a0bc48b6f2ee96a34392d307219
 SHA512:
-  metadata.gz: c375bbaa25682215b2507504a76a382c1b776018014c8dc1f9af32acd9714a7e0f1f0808945ef55ba8311e8689fca1ff720f3cc28b0c6f960da02406cd02030a
-  data.tar.gz: d3af35e4e8c42eea54cdb16b08202ed880d421478d8143a729fb847c7b6c6b2156e483f7f97844b18aac87a3e1cac1f66f57a93ef5b8d376f6b2aecf771690b7
+  metadata.gz: b4d3d94ff25dc21acc2fa5f963d0f20ae87a5704a680dcd10e9996e52b223325438d2da5e6794b760a2e0f8362fa597da18fa27fa27f8b828ca2a0c6dd0f7e9d
+  data.tar.gz: 94dfbd31daa4d202dae135edd442dd0ca9bcc180e56bcff55332fd43bcf5b588f450a284b6568f136aaa0f948eeeaf352e4fbac3d30d22dfb1b9e28159bdeb38

data/lib/json-crud-api/presenter.rb

@@ -1,7 +1,7 @@
 module JsonCrudApi
   class Presenter
 
-    attr_accessor :model, :exclude
+    attr_accessor :model, :include, :exclude
 
     def initialize(options)
       @model = options[:model]
@@ -13,25 +13,34 @@ module JsonCrudApi
     def render(data, operation = nil)
       return data.map {|d| render(d, operation) } if data.is_a?(Array)
 
-      properties = @model.properties.map { |p| p.name.to_sym }
-      unless @exclude.nil? or @exclude[:render].nil? 
-        properties -= @exclude[:render][:all] unless @exclude[:render][:all].nil?
-        properties -= @exclude[:render][operation] unless @exclude[:render][operation].nil?
-      end
-
-      Hash[properties.map { |p| [p, data.send(p)] }]
+      Hash[get_properties(:render, operation).map { |p| [p, data.send(p)] }]
     end
 
     def parse(data, operation = nil)
       return data.map {|d| parse(d, operation) } if data.is_a?(Array)
 
+      Hash[get_properties(:parse, operation).map { |p| [p,data[p]] }]
+    end
+
+    def get_properties(method, operation)
       properties = @model.properties.map { |p| p.name.to_sym }
-      unless @exclude.nil? or @exclude[:parse].nil? 
-        properties -= @exclude[:parse][:all] unless @exclude[:parse][:all].nil?
-        properties -= @exclude[:parse][operation] unless @exclude[:parse][operation].nil?
+      unless @exclude.nil?
+        properties -= @exclude[:all] unless @exclude[:all].nil?
+        properties -= @exclude[operation] unless @exclude[operation].nil?
+        unless @exclude[method].nil?
+          properties -= @exclude[method][:all] unless @exclude[method][:all].nil?
+          properties -= @exclude[method][operation] unless @exclude[method][operation].nil?
+        end
       end
-
-      Hash[properties.map { |p| [p,data[p]] }]
+      unless @include.nil?
+        properties += @include[:all] unless @include[:all].nil?
+        properties += @include[operation] unless @include[operation].nil?
+        unless  @include[method].nil?
+          properties += @include[method][:all] unless @include[method][:all].nil?
+          properties += @include[method][operation] unless @include[method][operation].nil?
+        end
+      end
+      properties
     end
 
   end

data/spec/unit/presenter_spec.rb

@@ -55,6 +55,46 @@ describe JsonCrudApi::Presenter do
       @presenter.render(data).should eq([{ :one => "Test" }, { :one => "TEST2" }])
     end
 
+    it 'should include render:all properties' do
+      @presenter.include = { :render => { :all => [:five] } }
+      @mock_model.stub :properties do
+        [OpenStruct.new(:name => :two)]
+      end
+      data = OpenStruct.new(:two => "Two",:five=>"Five")
+
+      @presenter.render(data).should eq({ :two => "Two", :five=>"Five" }) 
+    end
+
+    it 'should include global:all properties' do
+      @presenter.include = { :all => [:five] }
+      @mock_model.stub :properties do
+        [ OpenStruct.new(:name => :two)]
+      end
+      data = OpenStruct.new(:two => "Two",:five=>"Five")
+
+      @presenter.render(data).should eq({ :two => "Two", :five=>"Five" }) 
+    end
+
+    it 'should include global:operation properties' do
+      @presenter.include = { :test => [:five] }
+      @mock_model.stub :properties do
+        [ OpenStruct.new(:name => :two)]
+      end
+      data = OpenStruct.new(:two => "Two",:five=>"Five")
+
+      @presenter.render(data, :test).should eq({ :two => "Two", :five=>"Five" }) 
+    end
+
+    it 'should include render:operation properties' do
+      @presenter.include = { :render => { :test => [:five] } }
+      @mock_model.stub :properties do
+        [ OpenStruct.new(:name => :two)]
+      end
+      data = OpenStruct.new(:two => "Two",:five=>"Five")
+
+      @presenter.render(data, :test).should eq({ :two => "Two", :five=>"Five" }) 
+    end
+
     it 'should exclude render:all properties' do
       @presenter.exclude = { :render => { :all => [:one] } }
       @mock_model.stub :properties do
@@ -65,6 +105,16 @@ describe JsonCrudApi::Presenter do
       @presenter.render(data).should eq({ :two => "Two" }) 
     end
 
+    it 'should exclude global:all properties' do
+      @presenter.exclude = { :all => [:one] }
+      @mock_model.stub :properties do
+        [OpenStruct.new(:name => :one), OpenStruct.new(:name => :two)]
+      end
+      data = OpenStruct.new(:one => "Test",:two => "Two")
+
+      @presenter.render(data).should eq({ :two => "Two" }) 
+    end
+
     it 'should exclude render:operation properties' do
       @presenter.exclude = { :render => { :test => [:one] } }
       @mock_model.stub :properties do
@@ -75,6 +125,16 @@ describe JsonCrudApi::Presenter do
       @presenter.render(data, :test).should eq({ :two => "Two" }) 
     end
 
+    it 'should exclude global:operation properties' do
+      @presenter.exclude = { :test => [:one] }
+      @mock_model.stub :properties do
+        [OpenStruct.new(:name => :one), OpenStruct.new(:name => :two)]
+      end
+      data = OpenStruct.new(:one => "Test",:two => "Two")
+
+      @presenter.render(data, :test).should eq({ :two => "Two" }) 
+    end
+
     it 'should exclude combinations of render:all and render:operation properties' do
       @presenter.exclude = { :render => { :all => [:two] , :test => [:one] } }
       @mock_model.stub :properties do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-crud-api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Cully