noid 0.3.1 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/doc/active_record_sample.rb

@@ -0,0 +1,6 @@
+class Noidtest < ActiveRecord::Base
+  include Noid::ActiveRecord::Provider
+
+  identifier_field :identifier
+  minter Noid::Persistence::JSON.new(:template => 's.sdd', :filename => persistence_path)
+end

data/lib/noid.rb

@@ -6,6 +6,8 @@ require 'noid/persistence/json'
 require 'noid/identifier'
 require 'noid/identifier/singleton'
 require 'noid/identifier/anvl'
+require 'noid/active_record'
+require 'noid/active_record/provider'
 module Noid
 
 end

data/lib/noid/active_record.rb

@@ -0,0 +1,5 @@
+module Noid
+  module ActiveRecord
+
+  end
+end

data/lib/noid/active_record/provider.rb

@@ -0,0 +1,36 @@
+module Noid::ActiveRecord
+   module Provider
+     def self.included base
+       base.send :before_create, :mint_identifier
+    #   base.send :attr_accessor, :minter
+       class << base
+         def minter value = nil
+           @minter = value if value
+           @minter
+         end
+
+         def identifier_field value = nil
+           @identifier_field = value if value
+           @identifier_field
+         end
+
+         def persistence_path
+           File.join RAILS_ROOT, "db/#{self.to_s}_NOID.js"
+         end
+       end
+     end
+
+     def minter= value
+       @minter = value
+     end
+
+     def minter
+       @minter || self.class.minter
+     end
+
+     def mint_identifier
+       self.send "#{self.class.instance_variable_get('@identifier_field')}=", self.minter.mint unless self.attribute_present? self.class.instance_variable_get('@identifier_field')
+     end
+
+  end
+end

data/lib/noid/base.rb

@@ -9,6 +9,7 @@ module Noid
       @max = nil
       @min = nil
       @config = { :identifier => {} }.merge args
+      super() if respond_to?('super')
       setup_mask args
     end  
 
@@ -117,7 +118,8 @@ module Noid
     end
 
     def setup_mask args
-      @prefix, @mask = args[:template].split('.')
+      @template = args[:template]
+      @prefix, @mask = @template.split('.')
 
       @prefix = "#{args[:namespace]}/#{@prefix}" if args[:namespace]
 

data/lib/noid/persistence/json.rb

@@ -4,14 +4,16 @@ module Noid::Persistence
     FILENAME = 'NOID.js'
     def initialize args = {}
       @file = args[:filename] || FILENAME
-      data = load_json
+      @json = args[:json] || File.read(@file) rescue nil
+      data = load_json if @json
+      data ||= {}
       super data.merge(args)
       save
     end
 
     protected
     def load_json
-      data = ::JSON.parse(File.read(@file)) if File.exists? @file
+      data = ::JSON.parse(@json) rescue nil
       data ||= {}
       data = data.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} unless data.empty?
       data[:counters] = data[:counters].map { |x| x.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} } if data[:counters]
@@ -20,10 +22,16 @@ module Noid::Persistence
     end
 
     def save
+      str = self.to_json
       File.open(@file, 'w') do |f|
-          str = { :identifier => { :class => identifier }, :s => @s, :counters => @counters, :seed => @seed, }.to_json
         f.write(str)
-      end
+      end unless @file == '/dev/null'
+
+      str
+    end
+
+    def to_json
+      str = { :template => @template, :identifier => { :class => identifier.name }, :s => @s, :counters => @counters, :seed => @seed }.to_json
     end
 
   end

data/noid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noid}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2010-12-16}
+  s.date = %q{2010-12-23}
   s.description = %q{}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [
@@ -23,7 +23,10 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "doc/active_record_sample.rb",
     "lib/noid.rb",
+    "lib/noid/active_record.rb",
+    "lib/noid/active_record/provider.rb",
     "lib/noid/base.rb",
     "lib/noid/identifier.rb",
     "lib/noid/identifier/anvl.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noid
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,7 +136,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- doc/active_record_sample.rb
 - lib/noid.rb
+- lib/noid/active_record.rb
+- lib/noid/active_record/provider.rb
 - lib/noid/base.rb
 - lib/noid/identifier.rb
 - lib/noid/identifier/anvl.rb