bitfield_attribute 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22148454d826a5aed539e10565456317fde44ce0
-  data.tar.gz: c058f6722461be8857e46fd06877566b759be544
+  metadata.gz: e0f68aa834bb8f150a4bfcaa0534ad9b6693c004
+  data.tar.gz: 0808aa68a9a40ab6255baa675883b64222adb4a9
 SHA512:
-  metadata.gz: 999ab9f3495bf06de562a9d3ecdebcaf4939b2277bf454dc1b8a686b1f9f570cf98d80d72acf7a5d5995236623aa369402bb7eb31c94cdb5a48e9b82f4503271
-  data.tar.gz: cdfd13539d75cd867d8dc9c9148856fb262bf16d8432e362bf4721fd38afc037d3e5aef1aab99f8d7c267203f0c721a54b79e8ea66f7dcf6876a57b4dd1c3f1a
+  metadata.gz: c8a40e0f86dc4f80a1cd04169c8ad7b178e84d3b8cd456afca7dde20db0629420d5b5887fce04837253a1b0ba01d8f218de3be68f7f3e90bf759cbcc92316171
+  data.tar.gz: 31613ce6251d03270fd5d9a5c3829c99b29dc35cc70b3dfce9da1858f2c9ee0b60f9ec9c3d057af019e19aea83b80d7a4fe919f692f3d2e2fbb10701145ebe9d

data/lib/bitfield_attribute/base.rb

@@ -95,7 +95,10 @@ module BitfieldAttribute
         end
         write_bits
       end
+    end
 
+    def as_json(options = nil)
+      attributes
     end
 
     private
@@ -108,8 +111,10 @@ module BitfieldAttribute
       end
     end
 
-    def write_bits(bits = nil)
-      if bits.nil?
+    def write_bits(predefined_bits = nil)
+      if predefined_bits.present?
+        bits = predefined_bits
+      else
         bits = 0
         @values.keys.each.with_index do |name, index|
           bits = bits | (2 ** index) if @values[name]
@@ -117,6 +122,10 @@ module BitfieldAttribute
       end
 
       @instance[@attribute] = bits
+
+      if predefined_bits
+        read_bits
+      end
     end
 
     def true_value?(value)

data/lib/bitfield_attribute/version.rb

@@ -1,3 +1,3 @@
 module BitfieldAttribute
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/lib/activerecord_spec.rb

@@ -10,22 +10,38 @@ describe BitField::DatabaseUser do
     end
   end
 
-  it "works" do
-    BitField::DatabaseUser.create!(
-      name: "Artem",
-      bitfield: { first: true, second: false, last: true }
-    )
-
-    record = BitField::DatabaseUser.first
-    expect(record.bitfield.first?).to eq true
-    expect(record.bitfield.second?).to eq false
-    expect(record.bitfield.last?).to eq true
-
-    record.update!(record.attributes)
-
-    expect(record.bitfield.first?).to eq true
-    expect(record.bitfield.second?).to eq false
-    expect(record.bitfield.last?).to eq true
+  describe "#update" do
+    it "works with initial attributes" do
+      BitField::DatabaseUser.create!(
+        name: "Artem",
+        bitfield: { first: true, second: false, last: true }
+      )
+
+      record = BitField::DatabaseUser.first
+      expect(record.bitfield.first?).to eq true
+      expect(record.bitfield.second?).to eq false
+      expect(record.bitfield.last?).to eq true
+
+      record.update!(record.attributes)
+
+      expect(record.bitfield.first?).to eq true
+      expect(record.bitfield.second?).to eq false
+      expect(record.bitfield.last?).to eq true
+    end
+
+    it "works with changed attributes" do
+      BitField::DatabaseUser.create!(
+        name: "Artem",
+        bitfield: { first: true, second: true, last: true }
+      )
+
+      record = BitField::DatabaseUser.first
+      record.update!(bitfield: 7)
+
+      expect(record.bitfield.first?).to eq true
+      expect(record.bitfield.second?).to eq true
+      expect(record.bitfield.last?).to eq true
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitfield_attribute
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Viktor Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler