serial_preference 0.1.2 → 0.2.0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 amitsuroliya
+Copyright (c) 2012 Aditya Sanghi
 
 MIT License
 

data/lib/serial_preference/has_preference_map.rb

@@ -4,64 +4,73 @@ module HasPreferenceMap
   included do
     class_attribute :preference_context
     class_attribute :preference_storage_attribute
-    self.preference_context = table_name.downcase.to_sym
     self.preference_storage_attribute = :preferences
+    self.preference_context = "#{preference_storage_attribute}_#{table_name.downcase}".to_sym
   end
 
-  def default_preference_for(name,context = nil)
-    self.class.default_preference_for(name,context)
+  def default_preference_for(name)
+    self.class.default_preference_for(name)
   end
 
-  def preferences_for(group_name,storage_accessor = nil, context = nil)
-    send(storage_accessor || preference_storage_attribute).slice(*self.class.preferences_for(group_name,context))
+  def preferences_for(group_name)
+    send(preference_storage_attribute).slice(*self.class.preferences_for(group_name))
+  end
+
+  def preference_map
+    SerialPreference::Preferenzer.preferences_for(self.class.preference_context)
   end
 
   module ClassMethods
 
-    def preferences_for(group_name,context = nil)
-      SerialPreference::Preferenzer.group_for(context || preference_context)[group_name].try(:preference_keys) || []
+    def preference_groups
+      SerialPreference::Preferenzer.group_for(preference_context).try(:values) || []
     end
 
-    def preference_map(store_accessor = :preferences, context = nil, &block)
-      pc = context || preference_context
-      sa = store_accessor || self.preference_storage_attribute
-      SerialPreference::Preferenzer.draw(pc,&block)
-      prefers(sa,pc)
+    def preferences_for(group_name)
+      SerialPreference::Preferenzer.group_for(preference_context)[group_name].try(:preference_keys) || []
     end
 
-    def default_preference_for(name,context = nil)
-      SerialPreference::Preferenzer.preference(name,nil,context || preference_context)
+    def preference_map(store_attribute = nil, &block)
+      self.preference_storage_attribute = store_attribute || preference_storage_attribute
+      self.preference_context = "#{preference_storage_attribute}_#{table_name.downcase}".to_sym
+      SerialPreference::Preferenzer.reset(preference_context)
+      preferences = SerialPreference::Preferenzer.draw(preference_context,&block)
+
+      make_functions(preferences,store_attribute,preference_context)
     end
 
-    def prefers(store_accessor = :preferences, context = nil)
-      pc = context || preference_context
-      sa = store_accessor || self.preference_storage_attribute
+    def default_preference_for(name)
+      SerialPreference::Preferenzer.preference(name,nil,preference_context)
+    end
 
-      preferences = SerialPreference::Preferenzer.preferences_for(pc)
+    private
 
-      serialize sa, Hash
+    def make_functions(preferences,store_attribute,context)
+      serialize store_attribute, Hash
 
       preferences.each do |preference|
         key = preference.name
         define_method("#{key}=") do |value|
-          send(store_accessor)[key] = SerialPreference::Preferenzer.preference(key,value,context)
-          send("#{sa}_will_change!")
+          send(store_attribute)[key] = SerialPreference::Preferenzer.preference(key,value,context)
+          send("#{store_attribute}_will_change!")
         end
 
         define_method(key) do
-          SerialPreference::Preferenzer.preference(key,send(sa)[key],context)
+          value = send(store_attribute)[key]
+          SerialPreference::Preferenzer.preference(key,value,context)
         end
 
+        opts = {}
         if preference.required?
-          validates key, :presence => true
+          opts[:presence] = true
         end
-
         if preference.numerical?
-          validates key, :numericality => true, :allow_blank => true
+          opts[:numericality] = true
+          opts[:allow_blank] = true unless opts[:presence].present?
         end
+        validates key, opts if opts.present?
 
       end
-
     end
 
   end

data/lib/serial_preference/preference.rb

@@ -3,7 +3,7 @@ module SerialPreference
 
     SUPPORTED_TYPES = [:string,:integer,:real,:float,:boolean,:password]
 
-    attr_accessor :data_type, :name, :default, :required, :label, :hint
+    attr_accessor :data_type, :name, :default, :required, :label, :hint, :field_type
 
     def initialize(name,opts = {})
       self.data_type = opts[:data_type] || :string
@@ -12,6 +12,7 @@ module SerialPreference
       self.required = !!opts[:required]
       self.label = opts[:label]
       self.hint = opts[:hint]
+      self.field_type = opts[:field_type]
     end
 
     def required?
@@ -22,8 +23,12 @@ module SerialPreference
       [:integer,:float,:real].include?(data_type)
     end
 
+    def field_type
+      @field_type || (numerical? ? :string : data_type)
+    end
+
     def value(value)
-      value = value.presence || default
+      value = value.nil? ? default : value
       if !value.nil?
         case data_type
         when :string, :password

data/lib/serial_preference/preference_group.rb

@@ -9,6 +9,14 @@ module SerialPreference
       @label = opts[:label]
     end
 
+    def to_s
+      name.to_s
+    end
+
+    def titleize
+      label
+    end
+
     def label
       @label.presence || name.to_s.titleize
     end

data/lib/serial_preference/version.rb

@@ -1,3 +1,3 @@
 module SerialPreference
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/serial_preference.rb

@@ -5,19 +5,20 @@ require 'serial_preference/preference_group'
 require "serial_preference/has_preference_map"
 
 module SerialPreference
-	class Preferenzer
+  class Preferenzer
 
-		include Singleton
+    include Singleton
 
-		attr_accessor :preference_groups, :current_context
+    attr_accessor :preference_groups, :current_context
 
-		def self.draw(context = :base, &block)
-			i = instance
-			i.preference_groups ||= {}
-			i.preference_groups[context] ||= {}
-			i.current_context = context
-			i.instance_exec(&block)
-		end
+    def self.draw(context = :base, &block)
+      i = instance
+      i.preference_groups ||= {}
+      i.preference_groups[context] ||= {}
+      i.current_context = context
+      i.instance_exec(&block)
+      i.preferences_for(context)
+    end
 
     def +(name,opts = {})
       preference(name,opts)
@@ -27,69 +28,73 @@ module SerialPreference
       preference_group(name,opts,&block)
     end
 
-		def preference(name,opts = {})
-			pg = base_group
-			pg.pref(name,opts)
-		end
-
-		def preference_group(name, opts={},&block)
-			self.preference_groups[current_context] ||= {}
-			self.preference_groups[current_context][name] ||= SerialPreference::PreferenceGroup.new(name,opts)
-			self.preference_groups[current_context][name].instance_exec(&block)
-		end
-
-		def self.method_missing(name,*args,&block)
-			if instance.respond_to?(name)
-				instance.send(name,*args,&block)
-			else
-				super
-			end
-		end
-
-		def all_preference_names(context = :base)
-			group_for(context).values.map do |pg|
-				pg.preferences.map do |pref|
-					pref.name
-				end
-			end.flatten
-		end
-
-		def preferences_for(context = :base)
-			group_for(context).values.map do |pg|
-				pg.preferences.map do |pref|
-					pref
-				end
-			end.flatten
-		end
-
-		def each_preference(context = :base)
-			group_for(context).values.each do |pg|
-				pg.preferences.each do |pref|
-					yield(pref)
-				end
-			end
-		end
-
-		def preference(name,value,context = :base)
-			p = preferences_for(context).find{|x| x.name == name }
-			p ? p.value(value) : nil
-		end
-
-		def group_for(context = :base)
-			preference_groups[context] || {}
-		end
-
-		private
-
-		def base_group
-			@base_group ||= begin
-				pg = SerialPreference::PreferenceGroup.new(:base,:label => current_context.to_s.titleize)
-				self.preference_groups[current_context] ||= {}
-				self.preference_groups[current_context][:base] = pg
-				pg
-			end
-		end
-
-	end
+    def reset(context = :base)
+      self.preference_groups.try(:delete,context)
+    end
+
+    def preference(name,opts = {})
+      pg = base_group
+      pg.pref(name,opts)
+    end
+
+    def preference_group(name, opts={},&block)
+      self.preference_groups[current_context] ||= {}
+      self.preference_groups[current_context][name] ||= SerialPreference::PreferenceGroup.new(name,opts)
+      self.preference_groups[current_context][name].instance_exec(&block)
+    end
+
+    def self.method_missing(name,*args,&block)
+      if instance.respond_to?(name)
+        instance.send(name,*args,&block)
+      else
+        super
+      end
+    end
+
+    def all_preference_names(context = :base)
+      group_for(context).values.map do |pg|
+        pg.preferences.map do |pref|
+          pref.name
+        end
+      end.flatten
+    end
+
+    def preferences_for(context = :base)
+      group_for(context).values.map do |pg|
+        pg.preferences.map do |pref|
+          pref
+        end
+      end.flatten
+    end
+
+    def each_preference(context = :base)
+      group_for(context).values.each do |pg|
+        pg.preferences.each do |pref|
+          yield(pref)
+        end
+      end
+    end
+
+    def preference(name,value,context = :base)
+      p = preferences_for(context).find{|x| x.name == name }
+      p ? p.value(value) : nil
+    end
+
+    def group_for(context = :base)
+      preference_groups[context] || {}
+    end
+
+    private
+
+    def base_group
+      @base_group ||= begin
+        pg = SerialPreference::PreferenceGroup.new(:base,:label => current_context.to_s.titleize)
+        self.preference_groups[current_context] ||= {}
+        self.preference_groups[current_context][:base] = pg
+        pg
+      end
+    end
+
+  end
 end
 

data/serial_preference.gemspec

@@ -16,4 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_runtime_dependency "activesupport", ">= 3.0.0"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serial_preference
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-09-09 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Serialized Preferences for your models
 email:
 - aditya.sanghi@risingsuntech.net