bitmask_attributes 0.4.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 56a66728b3d7243fdee612e23879a0a3f402c3bc
+  data.tar.gz: dd949e03d9c0e71b321f2e2cf5b8fdf5d472a1fb
+SHA512:
+  metadata.gz: 44fd33dc8d30c3ae97f3d214fb3aa54262fbda5e1b614b6a80507c89ad43a1aa01797f89b4d5cb9511651be416f95c7085666868f7e0ad5daf1e16fdec1aa4d9
+  data.tar.gz: 32a51091ce2349650e90f9b24c888319b19928bb08880d245f3fdac74daa33181a6058a86cab9a58d55ad9050a1e7a9dce4d2387980ecf0d28990f48e7326211

data/.gitignore

@@ -1,3 +1,5 @@
+Gemfile.lock
+gemfiles/*.lock
 *.sw?
 .DS_Store
 coverage
@@ -7,4 +9,4 @@ pkg
 .#*
 *.gem
 /nbproject
-.idea/
+.idea/

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3@bitmask_attributes --create --install
+rvm 2.0.0

data/.travis.yml

@@ -2,3 +2,17 @@ script: 'bundle exec rake test'
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.1.gemfile

data/Appraisals

@@ -0,0 +1,12 @@
+appraise "3.1" do
+  gem "rails", "~> 3.1.0"
+end
+
+appraise "3.2" do
+  gem "rails", "~> 3.2.0"
+end
+
+appraise "4.0" do
+  gem "rails",      "~> 4.0.0"
+  gem "sass-rails", "~> 4.0.0"
+end

data/CHANGELOG.rdoc

@@ -1,4 +1,9 @@
-=== Version 0.4.0 - 2012-12-14 19:37:49 +0000
+=== Version 1.0.0 - 2013-11-04
+
+Fixes and Ruby2/Rails4 compatibility
+
+
+=== Version 0.4.0 - 2012-12-14
 
 Adrian Gomez (1):
 * Fixing issue #22
@@ -15,33 +20,13 @@ Dominik Bamberger (5):
 
 François DELFORT (2):
 * Handle single table inheritance
-* Fix for handling STI table
-
-Joel Moss (7):
-* Merge pull request #17 from teeparham/patch-1
-* Merge pull request #18 from tight/master
-* Merge pull request #29 from adimitrov/include-table-name
-* Merge pull request #33 from teeparham/or_is_null
-* Merge pull request #30 from pathable/default
-* Bundle update
-* Merge branch 'master' of github.com:joelmoss/bitmask_attributes
-
-Steve Hoeksema (2):
-* Strip trailing whitespace
-* Add table name to one scope that missed out
 
 Tee Parham (2):
-* update sample controller code
 * add table name scope to or_is_null_condition
 
 alexanderd (1):
 * Include table name in scope definitions
 
-steve emmons (3):
-* Merge pull request #26 from b4mboo/inverse_convenience
-* Merge pull request #25 from b4mboo/raw_bitmask_setter
-* Merge pull request #23 from Moove-it/master
-
 
 === Version 0.3.0 - 2012-04-30 21:36:18 +0100
 
@@ -73,7 +58,7 @@ steve emmons (3):
 * Merge pull request #15 from spemmons/master
 
 
-=== Version 0.2.4 - 2011-11-23 09:37:50 +0000
+=== Version 0.2.4 - 2011-11-23
 
 Ivan Buiko (3):
 * No longer validates attribute during migrations

data/Rakefile

@@ -1,6 +1,10 @@
 # encoding: UTF-8
-
-require "bundler"
+begin
+  require 'bundler/setup'
+  require 'appraisal'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

data/bitmask_attributes.gemspec

@@ -8,11 +8,12 @@ Gem::Specification.new do |gem|
   gem.email         = "joel@developwithstyle.com"
   gem.homepage      = "http://github.com/joelmoss/bitmask_attributes"
   gem.authors       = ['Joel Moss']
-  
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ['lib']
   gem.version       = BitmaskAttributes::VERSION.dup
-  
-  gem.add_dependency 'activerecord', '~> 3.0'
-end
+
+  gem.add_dependency 'activerecord', '>= 3.1'
+  gem.add_development_dependency "appraisal",     "~> 0.5.1"
+end

data/gemfiles/3.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sdoc"
+gem "rake"
+gem "shoulda"
+gem "sqlite3", ">=1.3.5"
+gem "turn"
+gem "rails", "~> 3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/3.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sdoc"
+gem "rake"
+gem "shoulda"
+gem "sqlite3", ">=1.3.5"
+gem "turn"
+gem "rails", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/4.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sdoc"
+gem "rake"
+gem "shoulda"
+gem "sqlite3", ">=1.3.5"
+gem "turn"
+gem "rails", "~> 4.0.0"
+gem "sass-rails", "~> 4.0.0"
+
+gemspec :path=>"../"

data/lib/bitmask_attributes.rb

@@ -12,11 +12,16 @@ module BitmaskAttributes
 
       if default = options[:default]
         after_initialize do
-          send("#{attribute}=", default) unless send("#{attribute}?")
+          send("#{attribute}=", default) unless send("#{attribute}?") || persisted?
         end
       end
 
-      bitmask_definitions[attribute] = Definition.new(attribute, options[:as].to_a,options[:null].nil? || options[:null], options[:zero_value], &extension)
+      bitmask_definitions[attribute] = Definition.new(attribute, 
+                                                      options[:as].to_a, 
+                                                      options[:null].nil? || options[:null], 
+                                                      options[:zero_value], 
+                                                      &extension)
+
       bitmask_definitions[attribute].install_on(self)
     end
 
@@ -38,6 +43,12 @@ module BitmaskAttributes
       @bitmasks ||= {}
     end
   end
+
+  def reload(*)
+    super
+    self.class.bitmasks.keys.each{|attribute| self.send("reload_#{attribute}")}
+    self
+  end
 end
 
 ActiveRecord::Base.send :include, BitmaskAttributes

data/lib/bitmask_attributes/definition.rb

@@ -2,7 +2,7 @@ module BitmaskAttributes
   class Definition
     attr_reader :attribute, :values, :allow_null, :zero_value, :extension
 
-    def initialize(attribute, values=[],allow_null = true,zero_value = nil, &extension)
+    def initialize(attribute, values=[], allow_null = true, zero_value = nil, &extension)
       @attribute = attribute
       @values = values
       @extension = extension
@@ -60,6 +60,9 @@ module BitmaskAttributes
           def #{attribute}
             @#{attribute} ||= BitmaskAttributes::ValueProxy.new(self, :#{attribute}, &self.class.bitmask_definitions[:#{attribute}].extension)
           end
+          def reload_#{attribute}
+            @#{attribute} = nil
+          end
         )
       end
 

data/lib/bitmask_attributes/version.rb

@@ -1,3 +1,3 @@
 module BitmaskAttributes
-  VERSION = "0.4.0".freeze
+  VERSION = "1.0.0".freeze
 end

data/test/bitmask_attributes_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class BitmaskAttributesTest < ActiveSupport::TestCase
 
-  def self.context_with_classes(label,campaign_class,company_class)
+  def self.context_with_classes(label, campaign_class, company_class)
     context label do
       setup do
         @campaign_class = campaign_class
@@ -139,6 +139,19 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
         assert_stored campaign, :web, :print
       end
 
+      should "update bitmask values currently in the database with reload" do
+        instance1 = @campaign_class.create(:medium => [:web, :print])
+        instance2 = @campaign_class.find(instance1.id)
+        assert instance1.id == instance2.id
+        assert instance1.object_id != instance2.object_id
+        assert instance1.update_attributes(:medium => [:email])
+
+        assert_equal [:web, :print],instance2.medium
+
+        assert_equal @campaign_class,instance2.reload.class
+        assert_equal [:email],instance2.medium
+      end
+
       context "checking" do
         setup { @campaign = @campaign_class.new(:medium => [:web, :print]) }
 
@@ -240,7 +253,7 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
         assert campaign.save
 
         assert_equal(
-          @campaign_class.find(:all, :conditions => ['medium & ? <> 0', @campaign_class.bitmask_for_medium(:print)]),
+          @campaign_class.where('medium & ? <> 0', @campaign_class.bitmask_for_medium(:print)).to_a,
           @campaign_class.medium_for_print
         )
 
@@ -305,9 +318,33 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
     assert_equal DefaultValue.new(:default_sym => :x).default_sym, [:x]
     assert_equal DefaultValue.new(:default_array => [:x]).default_array, [:x]
   end
+  
+  should "save empty bitmask when default defined" do
+    default = DefaultValue.create
+    assert_equal [:y], default.default_sym
+    default.default_sym = []
+    default.save
+    assert_empty default.default_sym
+    default2 = DefaultValue.find(default.id)
+    assert_empty default2.default_sym
+  end
 
-  context_with_classes 'Campaign with null attributes',CampaignWithNull,CompanyWithNull
-  context_with_classes 'Campaign without null attributes',CampaignWithoutNull,CompanyWithoutNull
-  context_with_classes 'SubCampaign with null attributes',SubCampaignWithNull,CompanyWithNull
-  context_with_classes 'SubCampaign without null attributes',SubCampaignWithoutNull,CompanyWithoutNull
+  context_with_classes 'Campaign with null attributes', CampaignWithNull, CompanyWithNull
+  context_with_classes 'Campaign without null attributes', CampaignWithoutNull, CompanyWithoutNull
+  context_with_classes 'SubCampaign with null attributes', SubCampaignWithNull, CompanyWithNull
+  context_with_classes 'SubCampaign without null attributes', SubCampaignWithoutNull, CompanyWithoutNull
+  
+  should "allow subclasses to have different values for bitmask than parent" do
+    a = CampaignWithNull.new
+    b = SubCampaignWithNull.new
+    a.different_per_class = [:set_for_parent]
+    b.different_per_class = [:set_for_sub]
+    a.save!
+    b.save!
+    a.reload
+    b.reload
+    assert_equal a.different_per_class, [:set_for_parent]
+    assert_equal b.different_per_class, [:set_for_sub]
+  end
+  
 end

data/test/support/models.rb

@@ -2,6 +2,7 @@ ActiveRecord::Schema.define do
   create_table :campaign_with_nulls do |t|
     t.integer :company_id
     t.integer :medium, :allow_zero, :misc, :Legacy
+    t.integer :different_per_class
     t.string :type # STI
   end
   create_table :company_with_nulls do |t|
@@ -10,6 +11,7 @@ ActiveRecord::Schema.define do
   create_table :campaign_without_nulls do |t|
     t.integer :company_id
     t.integer :medium, :allow_zero, :misc, :Legacy, :null => false, :default => 0
+    t.integer :different_per_class
     t.string :type # STI
   end
   create_table :company_without_nulls do |t|
@@ -30,6 +32,7 @@ class CampaignWithNull < ActiveRecord::Base
   belongs_to :company,:class_name => 'CompanyWithNull'
   bitmask :medium, :as => [:web, :print, :email, :phone]
   bitmask :allow_zero, :as => [:one, :two, :three], :zero_value => :none
+  bitmask :different_per_class, :as => [:set_for_parent]
   bitmask :misc, :as => %w(some useless values) do
     def worked?
       true
@@ -39,6 +42,7 @@ class CampaignWithNull < ActiveRecord::Base
 end
 
 class SubCampaignWithNull < CampaignWithNull
+  bitmask :different_per_class, :as => [:set_for_sub]
 end
 
 class CompanyWithoutNull < ActiveRecord::Base

data/test/test_helper.rb

@@ -3,9 +3,9 @@ require 'bundler/setup'
 
 require 'test/unit'
 begin; require 'turn'; rescue LoadError; end
-require 'shoulda'
 
 require 'active_record'
+require 'shoulda'
 
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'bitmask_attributes'

metadata

@@ -1,32 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bitmask_attributes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Joel Moss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-11-03 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.0'
+        version: '3.1'
   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: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.1
 description: 
 email: joel@developwithstyle.com
 executables: []
@@ -37,9 +48,9 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- Appraisals
 - CHANGELOG.rdoc
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -76,6 +87,9 @@ files:
 - doc/panel/index.html
 - doc/panel/links.html
 - doc/panel/tree.js
+- gemfiles/3.1.gemfile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
 - lib/bitmask_attributes.rb
 - lib/bitmask_attributes/definition.rb
 - lib/bitmask_attributes/value_proxy.rb
@@ -86,27 +100,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/joelmoss/bitmask_attributes
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple bitmask attribute support for ActiveRecord
 test_files:
 - test/bitmask_attributes/definition_test.rb

data/Gemfile.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bitmask_attributes (0.3.0)
-      activerecord (~> 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    arel (3.0.2)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    builder (3.0.4)
-    i18n (0.6.1)
-    json (1.7.5)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    multi_json (1.5.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.2)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
-    sqlite3 (1.3.6)
-    turn (0.9.6)
-      ansi
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bitmask_attributes!
-  rake
-  sdoc
-  shoulda
-  sqlite3 (>= 1.3.5)
-  turn