bitmasker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8e18e40165c1a709f4d8c17576fd36584f53bf5
-  data.tar.gz: 2d93c535a39aaa6d580d2fb99568e54ac92948bf
+  metadata.gz: e791e75331fc95bfeaa6a78b546d9ebefa5060d3
+  data.tar.gz: 1936a77afe674e2fdd355a5194a1200a09be30ca
 SHA512:
-  metadata.gz: a24fbbac996502ed2bf30641d2497e290db8da3d80a05c6e43ef7be8a1171f40b82111bc85f3a207b9fa73f5320a6b8febfd35750119d5982ae86e67344c1345
-  data.tar.gz: 892fc1cde3deda78f16dc566d5f2aeaa1ea93f24a5b2f8b78ac4ac0645b1632758e8632e1f15ed0500310315d2c4754804a4627f03d704aaf136d0feaf2ea7e3
+  metadata.gz: 95ac3d11a288dbe0e743f5b0422bb07a8fd877bfeb519c16e93676cc1c8b044b11313a47d4ce6f8a851fd58ac28fa72ebe543ee4c2b7b8dc52bc809134a1e822
+  data.tar.gz: c6ca3c910115b6a95f40be1fe9e9e5d8954edad1bab6d9f0a1854390696fbdb79c092547a43c947a1bfabcd404bafb27a3895eabb01f53fb8d44933cabbc2b43

data/lib/bitmasker/bitmask_scope.rb

@@ -7,6 +7,7 @@ module Bitmasker
 
     class_attribute :model_class
     class_attribute :field_name
+    class_attribute :table_name
     class_attribute :mask_name
     class_attribute :bitmask_attributes
 
@@ -20,6 +21,7 @@ module Bitmasker
       end
 
       klass.model_class = model_class
+      klass.table_name = model_class.table_name
       klass.field_name = field_name
       klass.mask_name = mask_name
       klass.bitmask_attributes = bitmask_attributes.stringify_keys
@@ -34,17 +36,17 @@ module Bitmasker
     # REVIEW: This (the unused _ attribute) tells me I have the design wrong
     def with_attribute(_, *attributes)
       # TODO: Test lots of databases
-      bitmask_query attributes, "#{field_name} & :mask = :mask"
+      bitmask_query attributes, "#{table_name}.#{field_name} & :mask = :mask"
     end
 
     def with_any_attribute(_, *attributes)
       # TODO: Test lots of databases
-      bitmask_query attributes, "#{field_name} & :mask <> 0"
+      bitmask_query attributes, "#{table_name}.#{field_name} & :mask <> 0"
     end
 
     def without_attribute(_, *attributes)
       # TODO: Test lots of databases
-      bitmask_query attributes, "#{field_name} & :mask = 0 OR #{field_name} IS NULL"
+      bitmask_query attributes, "#{table_name}.#{field_name} & :mask = 0 OR #{table_name}.#{field_name} IS NULL"
     end
 
     private

data/lib/bitmasker/version.rb

@@ -1,3 +1,3 @@
 module Bitmasker
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/bitmasker/bitmask_attributes_test.rb

@@ -3,6 +3,10 @@ require 'test_helper'
 class Bitmasker::BitmaskAttributesTest < MiniTest::Unit::TestCase
 
   MockModel = Class.new do
+    def self.table_name
+      "mock_models"
+    end
+
     def self.value_to_boolean(value)
       !!value
     end

data/test/bitmasker/bitmask_scope_test.rb

@@ -2,7 +2,11 @@ require 'test_helper'
 
 class Bitmasker::BitmaskScopeTest < MiniTest::Unit::TestCase
 
-  MockModel = Class.new
+  MockModel = Class.new do
+    def self.table_name
+      "mock_models"
+    end
+  end
 
   def model_instance
     @model_instance ||= MockModel.new
@@ -27,27 +31,27 @@ class Bitmasker::BitmaskScopeTest < MiniTest::Unit::TestCase
 
 
   def test_with_attribute
-    MockModel.expects(:where).with("email_mask & :mask = :mask", mask: 1)
+    MockModel.expects(:where).with("mock_models.email_mask & :mask = :mask", mask: 1)
     subject.with_emails(:send_weekly_email)
   end
 
   def test_with_attributes_array
-    MockModel.expects(:where).with("email_mask & :mask = :mask", mask: 6)
+    MockModel.expects(:where).with("mock_models.email_mask & :mask = :mask", mask: 6)
     subject.with_emails([:send_monthly_newsletter, :send_daily_spam])
   end
 
   def test_with_attributes
-    MockModel.expects(:where).with("email_mask & :mask = :mask", mask: 6)
+    MockModel.expects(:where).with("mock_models.email_mask & :mask = :mask", mask: 6)
     subject.with_emails(:send_monthly_newsletter, :send_daily_spam)
   end
 
   def test_without_attribute
-    MockModel.expects(:where).with("email_mask & :mask = 0 OR email_mask IS NULL", mask: 2)
+    MockModel.expects(:where).with("mock_models.email_mask & :mask = 0 OR mock_models.email_mask IS NULL", mask: 2)
     subject.without_emails(:send_monthly_newsletter)
   end
 
   def test_with_any_attribute
-    MockModel.expects(:where).with("email_mask & :mask <> 0", mask: 3)
+    MockModel.expects(:where).with("mock_models.email_mask & :mask <> 0", mask: 3)
     subject.with_any_emails([:send_weekly_email, :send_monthly_newsletter])
   end
 end

data/test/integration_test.rb

@@ -6,6 +6,10 @@ class MockModel
   attr_accessor :another_dummy_mask
   extend Bitmasker::Model
 
+  def self.table_name
+    "mock_models"
+  end
+
   def []=(sym, value)
     send "#{ sym }=", value
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitmasker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Amiel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitmask