property_sets 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b5df00e29ccc0cd797287b319e2590be6da231
-  data.tar.gz: 7c8d678433474ed11ca89649ed4462636d5cffbb
+  metadata.gz: a5d7eb2bd6c0063001b5a2b86995f89107a96da5
+  data.tar.gz: a58f90ed7802d717a7c3d1cade7aeb478a69e4c6
 SHA512:
-  metadata.gz: 695435a9ae1e80b85144188233235e602eeaec33389167711860fe6fc6903dc65bd76d7e0acb9286df9e1d4a2073ab3ded08779a4912ff1ae803309595597caf
-  data.tar.gz: 0f26718d6f50123d1516733b5083f028322b12a0ab8fcef60682865b3c336f44187ee3e033d1143d6668a8631b1dadb46fdcbbedb0ae46798629771746f37189
+  metadata.gz: 26ffb3ba5727f7b59cb0e4294687d728e4cadd9603c02d3ae94df7a1c3ed1fcbb0acc959fa2b5b613a49cea3d44e470e28a0e09fe970faa7b1c04ec03d1b093b
+  data.tar.gz: 1197ac6243e2d2e3f5952af4bf3dc11b8cb56ec89c26fc8cdd848594af29e9950bd58e1fd235d9459f42083d43054d94b2bfe61e499df8a66bed5df9cc44a890

data/lib/property_sets/active_record_extension.rb

@@ -110,36 +110,18 @@ module PropertySets
             detect { |property| property.name.to_sym == arg.to_sym }
           end
 
-          if ActiveRecord::VERSION::STRING < "3.2.0"
-            def lookup_value(type, key)
-              serialized = property_serialized?(key)
+          def lookup_value(type, key)
+            serialized = property_serialized?(key)
 
-              if instance = lookup_without_default(key)
-                instance.value_serialized = serialized
-                PropertySets::Casting.read(type, instance.value)
-              else
-                value = default(key)
-                if serialized
-                  PropertySets::Casting.deserialize(value)
-                else
-                  PropertySets::Casting.read(type, value)
-                end
-              end
-            end
-          else
-            def lookup_value(type, key)
-              serialized = property_serialized?(key)
-
-              if instance = lookup_without_default(key)
-                instance.value_serialized = serialized
-                PropertySets::Casting.read(type, instance.value)
+            if instance = lookup_without_default(key)
+              instance.value_serialized = serialized
+              PropertySets::Casting.read(type, instance.value)
+            else
+              value = default(key)
+              if serialized
+                PropertySets::Casting.deserialize(value)
               else
-                value = proxy_association.klass.default(key)
-                if serialized
-                  PropertySets::Casting.deserialize(value)
-                else
-                  PropertySets::Casting.read(type, value)
-                end
+                PropertySets::Casting.read(type, value)
               end
             end
           end
@@ -150,11 +132,7 @@ module PropertySets
             instance ||= build_default(arg)
             instance.value_serialized = property_serialized?(arg)
 
-            if ActiveRecord::VERSION::STRING >= "3.1.0"
-              owner = proxy_association.owner
-            else
-              owner = @owner
-            end
+            owner = proxy_association.owner
 
             instance.send("#{owner_class_sym}=", owner) if owner.new_record?
             instance

data/lib/property_sets/casting.rb

@@ -2,11 +2,13 @@ require 'json'
 
 module PropertySets
   module Casting
+    FALSE = [ "false", "0", "", "off", "n" ]
 
-    def self.read(type, value)
-      return nil if value.nil?
+    class << self
+      def read(type, value)
+        return nil if value.nil?
 
-      case type
+        case type
         when :string
           value
         when :datetime
@@ -16,17 +18,17 @@ module PropertySets
         when :integer
           value.to_i
         when :boolean
-          ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
+          !false?(value)
         when :serialized
           # deserialization happens in the model
           value
+        end
       end
-    end
 
-    def self.write(type, value)
-      return nil if value.nil?
+      def write(type, value)
+        return nil if value.nil?
 
-      case type
+        case type
         when :datetime
           if value.is_a?(String)
             value
@@ -36,15 +38,23 @@ module PropertySets
         when :serialized
           # write the object directly.
           value
+        when :boolean
+          false?(value) ? "0" : "1"
         else
           value.to_s
+        end
       end
-    end
 
-    def self.deserialize(value)
-      return nil if value.nil? || value == "null"
-      JSON.parse(value)
-    end
+      def deserialize(value)
+        return nil if value.nil? || value == "null"
+        JSON.parse(value)
+      end
+
+      private
 
+      def false?(value)
+        FALSE.include?(value.to_s.downcase)
+      end
+    end
   end
 end

data/lib/property_sets/property_set_model.rb

@@ -100,21 +100,19 @@ module PropertySets
       end
 
       def default(key)
-        if @properties[key] && @properties[key].key?(:default)
-          PropertySets::Casting.read(type(key), @properties[key][:default])
-        end
+        PropertySets::Casting.read(type(key), raw_default(key))
       end
 
       def raw_default(key)
-        @properties[key] && @properties[key].key?(:default) ? @properties[key][:default] : nil
+        @properties[key].try(:[], :default)
       end
 
       def type(key)
-        @properties[key] && @properties[key].key?(:type) ? @properties[key][:type] : :string
+        @properties[key].try(:[], :type) || :string
       end
 
       def protected?(key)
-        @properties[key] && !!@properties[key][:protected]
+        @properties[key].try(:[], :protected) || false
       end
 
       def owner_class=(owner_class_name)

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

metadata

@@ -1,67 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.14
-    - - <
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.14
-    - - <
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is an ActiveRecord extension which provides a convenient interface
@@ -71,18 +51,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
-- Appraisals
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- benchmark/read.rb
-- gemfiles/rails2.3.gemfile
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
 - lib/property_sets.rb
 - lib/property_sets/action_view_extension.rb
 - lib/property_sets/active_record_extension.rb
@@ -90,16 +58,6 @@ files:
 - lib/property_sets/delegator.rb
 - lib/property_sets/property_set_model.rb
 - lib/property_sets/version.rb
-- property_sets.gemspec
-- test/database.rb
-- test/fixtures/account_settings.yml
-- test/fixtures/account_texts.yml
-- test/fixtures/accounts.yml
-- test/helper.rb
-- test/test_casting.rb
-- test/test_delegator.rb
-- test/test_property_sets.rb
-- test/test_view_extensions.rb
 homepage: http://github.com/zendesk/property_sets
 licenses:
 - MIT
@@ -110,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Property sets for ActiveRecord.

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.gitignore

@@ -1,10 +0,0 @@
-Gemfile.lock
-test/*.log
-.rvmrc
-coverage
-rdoc
-doc
-.yardoc
-.bundle
-pkg
-gemfiles/*.lock

data/.travis.yml

@@ -1,21 +0,0 @@
-rvm:
-  - ree
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby
-script: "bundle exec rake test"
-gemfile:
-  - gemfiles/rails2.3.gemfile
-  - gemfiles/rails3.2.gemfile
-  - gemfiles/rails4.0.gemfile
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails2.3.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails2.3.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails3.2.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails4.0.gemfile

data/Appraisals

@@ -1,20 +0,0 @@
-appraise "rails2.3" do
-  gem "activerecord", "~> 2.3.14"
-  gem "activesupport", "~> 2.3.14"
-  gem "shoulda", "~> 2.11"
-  gem "mysql2", "~> 0.2.0", :platforms => :ruby
-  gem "activerecord-mysql2-adapter", :platforms => :ruby
-  gem "mocha", "~> 0.12.0"
-  gem "test-unit", "< 2.5.5"
-end
-
-appraise "rails3.2" do
-  gem "activerecord", "~> 3.2.6"
-  gem "activesupport", "~> 3.2.6"
-end
-
-appraise "rails4.0" do
- gem "activerecord", "~> 4.0.2"
- gem "activesupport", "~> 4.0.2"
- gem "protected_attributes"
-end

data/Gemfile

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcmysql-adapter', '1.3.5', :platforms => :jruby
-gem 'mysql2', :platforms => :ruby
-
-gem 'bump'
-gem 'rake'
-gem 'bundler'
-gem 'shoulda'
-gem 'mocha'
-gem 'appraisal'
-gem 'test-unit', '>= 2.5.2'
-gem 'actionpack', '>= 2.3.14', '< 4.1'
-gem 'iconv', :platforms => :ruby_20
-
-gemspec

data/LICENSE

@@ -1,176 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS