bit_settings 0.2.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 464f34cd7657504d7fa8894323e46c91428fe92d
-  data.tar.gz: 80bcee5ca0e69975aecceb30ee6332ff505f1106
+  metadata.gz: bbe6929010f46355a8411c24e71ad634dfabf91e
+  data.tar.gz: d51338d7219015ad4a65ea6ea4151e9c12174c94
 SHA512:
-  metadata.gz: b386cc6c1f42e24a2a85d0d80dee94559b6426f4c4dc3f552f727ccf3b49ac56a7e6d943aee553fd036b6d56cce5958243ed76a66a4534ed139196d7cfc83aa8
-  data.tar.gz: 7413b61584d468010e5953a894e9439d6bb9126462af5c8205050e604f7caa854f006de32cf0fd801453b15084bf9675ab767574674477bf6f1c6bac49dda3c1
+  metadata.gz: ff7742c8333aca311fa384826f234452cd9dea8429bb788775024f220521e8ce0b3155032ca0e7aca8fde28b14d79286d4e47ac9e8235929821b1a5e6b116738
+  data.tar.gz: 47d86235107e3f348eaf632fd28c6402bc34e83747900b23368c89f06a7586af868e28330f14ee6ee60c9038ac73155c168f206932b5ffc9537e02279ddc4096

data/README.md

@@ -39,7 +39,7 @@ Then in your model:
 ```
 class User extends ActiveRecord::Base
   include BitSettings
-  add_settings settings: [:disable_notifications, :help_tour_shown]
+  add_settings :disable_notifications, :help_tour_shown
 end
 ```
 
@@ -52,11 +52,19 @@ user.disable_notifications = true # => true
 user.save
 ```
 
-Other options are `:column` and `:prefix`:
+You can also use the scope `with_settings` which takes a hash as parameter like the example below:
+
+```
+# Get all users with the value of setting disable_notifications equal to true
+# and the settings help_tour_shown equal to false.
+users = User.with_settings(disable_notifications: true, help_tour_shown: false)
+```
+
+Available options are `:column` and `:prefix`:
 
 ```
 class User extends ActiveRecord::Base
-  add_settings settings: [:disable_notifications, :help_tour_shown], column: :my_settings, prefix: :setting
+  add_settings :disable_notifications, :help_tour_shown, column: :my_settings, prefix: :setting
 end
 ```
 * `:column` specify the name of the column to use (default is `settings`)
@@ -64,6 +72,7 @@ end
 
 ```
 user.setting_disable_notifications? # => false
+users = User.with_settings(setting_disable_notifications: false)
 ```
 
 ## Development

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
-task :default => :spec
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << 'test' << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+task default: :test

data/bit_settings.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "bit_settings"
   spec.version       = BitSettings::VERSION
   spec.authors       = ["pioz"]
-  spec.email         = ["enrico@megiston.it"]
+  spec.email         = ["epilotto@gmx.com"]
 
   spec.summary       = %q{BitSettings is a plugin for ActiveRecord that transform a column of your model in a set of boolean settings.}
   spec.description   = %q{BitSettings is a plugin for ActiveRecord that transform a column of your model in a set of boolean settings.}
@@ -19,8 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 12.3"  
+  spec.add_development_dependency "sqlite3", "~> 1.3"
+  spec.add_development_dependency "minitest", "~> 5.11"
 
-  spec.add_dependency "activemodel", ">= 5.0.0"
+  spec.add_dependency "activesupport", ">= 4.2.0"
+  spec.add_dependency "activemodel", ">= 4.2.0"
+  spec.add_dependency "activerecord", ">= 4.2.0"
 end

data/lib/bit_settings/boolean_value.rb

@@ -0,0 +1,21 @@
+module BooleanValue
+
+  FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF']
+
+  def self.cast_to_boolean_func
+
+    major, minor, _ = ActiveModel.version.to_s.split('.').map(&:to_i)
+    case major
+    # Rails 5
+    when 5
+      return ->(value) { ActiveModel::Type::Boolean.new.cast(value) }
+    # Rails 4.2
+    when 4
+      if minor >= 2
+        return ->(value) { ActiveRecord::Type::Boolean.new.type_cast_from_user(value) }
+      end
+    end
+    return ->(value) { value == '' ? nil : !FALSE_VALUES.include?(value) }
+  end
+
+end

data/lib/bit_settings/version.rb

@@ -1,3 +1,3 @@
 module BitSettings
-  VERSION = '0.2.0'
+  VERSION = '1.0.2'
 end

data/lib/bit_settings.rb

@@ -1,30 +1,59 @@
 require 'bit_settings/version'
+require 'bit_settings/boolean_value'
 
 module BitSettings
+  extend ActiveSupport::Concern
+  
+  included do
+    class_attribute :bit_settings
+
+    scope :with_settings, -> (h) do
+      available = self.bit_settings.values.flatten
+      invalid = h.keys - available
+      raise "Settings #{invalid.inspect} do not exist for #{self} model: available settings are #{available.inspect}" if invalid.any?
+      scope = current_scope
+      self.bit_settings.each do |column, settings|
+        true_mask  = h.select{|k, v| settings.include?(k) &&  v}.keys.reduce(0) {|memo, x| memo | (1 << settings.index(x))}
+        false_mask = h.select{|k, v| settings.include?(k) && !v}.keys.reduce(0) {|memo, x| memo | (1 << settings.index(x))}
+        scope = scope.where("#{table_name}.#{column} & #{true_mask} = #{true_mask}") if  true_mask > 0
+        scope = scope.where("#{table_name}.#{column} & #{false_mask} = 0") if false_mask > 0
+      end
+      return scope
+    end
 
-  def self.included(base)
-    base.extend(self)
   end
 
-  def add_settings(settings:, column: :settings, prefix: nil)
-    prefix = prefix ? "#{prefix}_" : ''
-    if settings.size > 32
-      raise 'You can NOT have more than 32 settings (max unsigned int with 4 bytes is 2^32-1)'
-    else
-      settings.each_with_index do |setting, i|
-        define_method "#{prefix}#{setting}" do
-          self.send(column) & (1 << i) > 0
-        end
-        alias_method "#{prefix}#{setting}?", "#{prefix}#{setting}"
-        define_method "#{prefix}#{setting}=" do |value|
-          if ActiveModel::Type::Boolean.new.cast(value)
-            self.send("#{column}=", self.send(column) | (1 << i))
-          else
-            self.send("#{column}=", self.send(column) & ~(1 << i))
+  module ClassMethods
+
+    def add_settings(*settings, column: :settings, prefix: nil)
+      prefix = prefix ? "#{prefix}_" : ''
+      if settings.size > 32
+        raise 'You can NOT have more than 32 settings (max unsigned int with 4 bytes is 2^32-1)'
+      else
+
+        self.bit_settings ||= {}
+        self.bit_settings[column] = settings.map{|x| "#{prefix}#{x}".to_sym}
+
+        cast_to_boolean = BooleanValue.cast_to_boolean_func
+
+        settings.each_with_index do |setting, i|
+          define_method "#{prefix}#{setting}" do
+            self.send(column) & (1 << i) > 0
+          end
+          alias_method "#{prefix}#{setting}?", "#{prefix}#{setting}"
+          
+          define_method "#{prefix}#{setting}=" do |value|
+            if cast_to_boolean.call(value)
+              self.send("#{column}=", self.send(column) | (1 << i))
+            else
+              self.send("#{column}=", self.send(column) & ~(1 << i))
+            end
           end
         end
+
       end
     end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bit_settings
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.2
 platform: ruby
 authors:
 - pioz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,59 +16,114 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.0
 description: BitSettings is a plugin for ActiveRecord that transform a column of your
   model in a set of boolean settings.
 email:
-- enrico@megiston.it
+- epilotto@gmx.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bit_settings.gemspec
 - lib/bit_settings.rb
+- lib/bit_settings/boolean_value.rb
 - lib/bit_settings/version.rb
 homepage: https://github.com/pioz/bit_settings
 licenses:
@@ -90,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: BitSettings is a plugin for ActiveRecord that transform a column of your

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "bit_settings"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here