hstore_flags 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e686a0ea0b3be6411d2cc926b7c0cfd4ad710f4
+  data.tar.gz: 666ab02a4e823bdc71282db46836f703ff1ff410
+SHA512:
+  metadata.gz: 2954317f122b1a388a0a55ed53de61b2732e724a965266aeaffc0a8d47e0b80ac3c4c4bddc10ebaa9581a20ed431784bcdd6e102623c7fb362bcf26d814bafb6
+  data.tar.gz: 269644cf3141f1b44b6e0a109f19a0646f7828664307efa1059e77cdbba3a818f83cab72b876165f993105ff64f5c91e87d69c579402728647f961c5a94dd590

data/Gemfile

@@ -1,8 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-gem 'activerecord', '~>3.0'
-gem 'activerecord-postgres-hstore', '~>0.4'
-gem 'pg', '~>0.14'
-gem 'rspec', '~>2'
-gem 'rake'

data/Gemfile.lock

@@ -2,52 +2,50 @@ PATH
   remote: .
   specs:
     hstore_flags (0.2.0)
-      activerecord (~> 3.1)
-      activerecord-postgres-hstore (~> 0.7.5)
+      activerecord (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activerecord-postgres-hstore (0.7.6)
-      activerecord (>= 3.1)
-      pg-hstore (>= 1.1.5)
-      rake
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.14)
+    builder (3.1.4)
     diff-lcs (1.2.4)
-    i18n (0.6.1)
-    multi_json (1.7.3)
-    pg (0.15.1)
-    pg-hstore (1.1.7)
-    rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    i18n (0.6.5)
+    minitest (4.7.5)
+    multi_json (1.8.0)
+    pg (0.17.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.3)
+    thread_safe (0.1.3)
+      atomic
     tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0)
-  activerecord-postgres-hstore (~> 0.4)
   hstore_flags!
-  pg (~> 0.14)
-  rake
-  rspec (~> 2)
+  pg
+  rspec

data/README.md

@@ -6,7 +6,7 @@ integer/bit flags aggrevating you? try this.
 Requirements
 ------------
 
-* Rails 3.0 or greater
+* Rails 4.0 or greater
 * Postgresql 8.4+ with contrib package
 * Read [activerecord-postgres-hstore](https://raw.github.com/engageis/activerecord-postgres-hstore) for index creation
 

data/hstore_flags.gemspec

@@ -12,8 +12,7 @@ Gem::Specification.new do |s|
   s.license       = "MIT"
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", "~> 3.1"
-  s.add_dependency "activerecord-postgres-hstore", "~> 0.7.5"
+  s.add_dependency "activerecord", "~> 4.0"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "pg"

data/lib/hstore_flags/version.rb

@@ -1,3 +1,3 @@
 module HStoreFlags
-  Version = VERSION = "0.2.0"
+  Version = VERSION = "0.3.0"
 end

data/lib/hstore_flags.rb

@@ -1,52 +1,48 @@
 require 'hstore_flags/version'
-require 'activerecord-postgres-hstore'
 
 module HStoreFlags
+  extend ActiveSupport::Concern
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']
+  STORED_TRUE_VALUE = 'true'
 
-  def self.included(base)
-    base.extend(ClassMethods)
+  private
 
-    protected
-    def set_hstore_flag_field(field, flag, value)
-      new_val = TRUE_VALUES.include?(value)
-      old_val = self.send(flag)
-      return if new_val == old_val
+  def set_hstore_flag_field(field, flag, value)
+    new_val = TRUE_VALUES.include?(value)
+    old_val = send(flag)
+    return if new_val == old_val
 
-      if defined? changed_attributes
-        send(:changed_attributes).merge!(flag.to_s => old_val)
-      end
+    send("#{field}_will_change!")
+    if defined? changed_attributes
+      send(:changed_attributes).merge!(flag.to_s => old_val)
+    end
+    fields = self[field] || {}
 
-      if new_val
-        self[field] = (self[field] || {}).merge({flag.to_s => true.to_s})
-      else
-        field_flags = self[field] || {}
-        field_flags.delete(flag.to_s)
-        self[field] = field_flags
-      end
-      send("#{field}_will_change!")
-      new_val
+    if new_val
+      self[field] = fields.merge(flag.to_s => STORED_TRUE_VALUE)
+    else
+      fields.delete(flag.to_s)
+      self[field] = fields
     end
+    new_val
   end
 
   module ClassMethods
     def hstore_flags(*args)
-      opts  = args.last.is_a?(Hash) ? args.pop.dup : {}
+      opts  = args.extract_options!
       field = opts[:field] || "flags"
       table_field = "#{self.table_name}." + field
 
-      serialize field, ActiveRecord::Coders::Hstore
-
       args.each do |flag|
-        define_method("#{flag}")      {(self[field] || {})[flag.to_s] == "true"}
-        define_method("#{flag}?")     {(self[field] || {})[flag.to_s] == "true"}
-        define_method("not_#{flag}")  {(self[field] || {})[flag.to_s] != "true"}
-        define_method("not_#{flag}?") {(self[field] || {})[flag.to_s] != "true"}
+        define_method("#{flag}")      {(self[field] || {})[flag.to_s] == STORED_TRUE_VALUE}
+        define_method("#{flag}?")     {(self[field] || {})[flag.to_s] == STORED_TRUE_VALUE}
+        define_method("not_#{flag}")  {(self[field] || {})[flag.to_s] != STORED_TRUE_VALUE}
+        define_method("not_#{flag}?") {(self[field] || {})[flag.to_s] != STORED_TRUE_VALUE}
         define_method("#{flag}=")     {|val| set_hstore_flag_field(field, flag, val)}
 
         unless opts[:scopes] == false
-          scope "#{flag}",     where("defined(#{table_field}, '#{flag}') IS TRUE")
-          scope "not_#{flag}", where("defined(#{table_field}, '#{flag}') IS NOT TRUE")
+          scope "#{flag}", -> { where("defined(#{table_field}, '#{flag}') IS TRUE") }
+          scope "not_#{flag}", -> { where("defined(#{table_field}, '#{flag}') IS NOT TRUE") }
 
           class_eval <<-EVAL
             def self.#{flag}_condition

metadata

@@ -1,78 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hstore_flags
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Zachery Hostens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: activerecord-postgres-hstore
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -95,32 +72,25 @@ files:
 homepage: https://github.com/infinitysw/hstore_flags
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2479143759331100119
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2479143759331100119
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Store many boolean flags in an hstore column in PostgreSQL
 test_files: []