odata-model 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9d0c38d9a9e5b4480cc15ec55c330911e4b79f
-  data.tar.gz: 5090acae175c544469e672293e617cf93ad94f3a
+  metadata.gz: 995370eea78ea8a601aa51f63c24d4c5b44ca21f
+  data.tar.gz: 8407abe05108d9cd8ea77715de0b34feb45d0256
 SHA512:
-  metadata.gz: 79d40b08cec2be355243b83c4b0ed47d35515daf9d26f47c9b470c45d29e198789140bb4affff9d1f40c65ca5254c0e3c7c839f8739e81dd295890564503cc35
-  data.tar.gz: c1ff959f5ae6818b7fe1c1aa2e4e291bf6a90d72d155382c56258ec70a582e28c3cc407c80718cb5cd458147f42139ccc7a73bc970d227dc81bbed1e0ef2ff04
+  metadata.gz: 83cbbcb630063ab7b5ea5b09842890da0e2bbbad209904f44118e7c7acd4b923b62c176e7fbe9e3795cf9d776fcc1d0d171f8e5f3c17112a8f376c0373673c80
+  data.tar.gz: 43e2eabce06e6bf56c687ba98714263943673aafc1bf15abe967fcded63f7681c6d5da38907373565be0ff141ba8f30edfd5e9b4567513e504883e695819ab6c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.4.0
+
+* Removed strict dependency on ActiveModel.
+* Added `limit_default_selection` setting to limit default queries to only the
+  supplied properties of a model.
+
 ## 0.3.0
 
 * Added OData::Model::Railtie for Ruby on Rails integration.

data/lib/odata/model/attributes.rb

@@ -90,7 +90,7 @@ module OData
           property_map[attribute_name] = literal_name
 
           # Ties into ActiveModel::Dirty
-          define_attribute_methods attribute_name
+          define_attribute_methods attribute_name if defined?(::ActiveModel)
 
           nil
         end

data/lib/odata/model/configuration.rb

@@ -70,6 +70,14 @@ module OData
           nil
         end
 
+        # Sets the configuration option to cause a select operation to be set
+        # by default that only queries for the properties defined in the model.
+        #
+        # @return [nil]
+        def limit_default_selection
+          odata_config[:limit_default_selection] = true
+        end
+
         # Get the OData::Service
         # @return [OData::Service]
         # @api private

data/lib/odata/model/query_proxy.rb

@@ -14,6 +14,7 @@ module OData
         @target = model_class
         @query = target.odata_entity_set.query
         @last_criteria = nil
+        set_default_select
       end
 
       # Sets up a new criteria for filters for the given property name.
@@ -80,9 +81,19 @@ module OData
         end
       end
 
+      # By default we only select the properties defined on the Model.
+      # @api private
+      def set_default_select
+        if target.odata_config[:limit_default_selection]
+          query.select(target.property_map.values)
+        end
+        self
+      end
+
       private
 
       attr_reader :target, :query
+
     end
   end
 end

data/lib/odata/model/version.rb

@@ -1,5 +1,5 @@
 module OData
   module Model
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/odata/model.rb

@@ -5,7 +5,7 @@ require 'active_support/concern'
 require 'odata'
 
 require 'odata/model/version'
-require 'odata/model/active_model'
+require 'odata/model/active_model' if defined?(::ActiveModel)
 require 'odata/model/configuration'
 require 'odata/model/attributes'
 require 'odata/model/persistence'
@@ -22,7 +22,7 @@ module OData
   module Model
     extend ActiveSupport::Concern
 
-    include OData::Model::ActiveModel
+    include OData::Model::ActiveModel if defined?(::ActiveModel)
     include OData::Model::Configuration
     include OData::Model::Attributes
     include OData::Model::Persistence

data/odata-model.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'rspec', '~> 3.0.0'
 
+  spec.add_development_dependency 'activemodel', '>= 3.0.0'
+
   spec.add_dependency 'odata', '~> 0.5'
   spec.add_dependency 'activesupport', '>= 3.0.0'
-  spec.add_dependency 'activemodel', '>= 3.0.0'
 
   spec.add_dependency 'slop', '~> 3.6.0'
 end

data/spec/example_models/odatademo_limited_product.rb

@@ -0,0 +1,13 @@
+class LimitedProduct
+  include OData::Model
+
+  use_service 'ODataDemo'
+  for_entity  'Product'
+
+  limit_default_selection
+
+  property 'ID'
+  property 'Name'
+  property 'Rating'
+  property 'Price'
+end

data/spec/model/active_model_lint_spec.rb

@@ -1,3 +1,4 @@
+require 'active_model'
 require 'spec_helper'
 
 describe OData::Model do

data/spec/model/query_proxy_spec.rb

@@ -5,6 +5,12 @@ describe OData::Model::QueryProxy do
   let(:query_proxy) { OData::Model::QueryProxy.new(Product) }
   let(:query_string) { subject.send(:query).to_s }
 
+  it 'allows limiting default selection to only selecting defined properties' do
+    query_proxy = OData::Model::QueryProxy.new(LimitedProduct)
+    query_string = query_proxy.send(:query).to_s
+    expect(query_string).to eq('Products?$select=ID,Name,Rating,Price')
+  end
+
   it { expect(subject).to respond_to(:where) }
   describe '#where' do
     let(:subject) { query_proxy.where(:name) }

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ OData::Service.open('http://services.odata.org/OData/OData.svc', name: 'ODataDem
 
 require 'example_models/bare_model'
 require 'example_models/odatademo_product'
+require 'example_models/odatademo_limited_product'
 require 'example_models/odatademo_person'
 
 RSpec::Matchers.define :be_boolean do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata-model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,35 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: odata
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
+        version: 3.0.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: odata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,6 +167,7 @@ files:
 - lib/odata/model/version.rb
 - odata-model.gemspec
 - spec/example_models/bare_model.rb
+- spec/example_models/odatademo_limited_product.rb
 - spec/example_models/odatademo_person.rb
 - spec/example_models/odatademo_product.rb
 - spec/model/active_model_lint_spec.rb
@@ -202,6 +203,7 @@ specification_version: 4
 summary: An ActiveModel mapping layer for the OData gem
 test_files:
 - spec/example_models/bare_model.rb
+- spec/example_models/odatademo_limited_product.rb
 - spec/example_models/odatademo_person.rb
 - spec/example_models/odatademo_product.rb
 - spec/model/active_model_lint_spec.rb