dotdot 0.1.1 → 0.1.2

data/lib/dotdot/base.rb

@@ -3,50 +3,17 @@ module Dotdot
     attr_reader :database
 
     def initialize(object)
-      @object = object
       @database = nil
-      @sql_options = { :logger => @object.logger, :sql_log_level => :info }
+      @object   = object
+      @options  = object.options
+      @logger   = Logger.new(STDOUT)
+      @sql_options = { :logger => @logger, :sql_log_level => :info }
 
-      if @object.options[:verbose]
+      if @options[:verbose]
         @sql_options[:sql_log_level] = :debug
       end
     end
 
-    def boot
-      @database = Sequel.sqlite(@object.db_path, @sql_options)
-      @group = ""
-      @prefix_stack = []
-
-      @dataset = @database[:cablingdatas]
-    end
-
-    def final_key(key)
-      unless @prefix_stack.empty?
-        @prefix_stack.push(key)
-        key = nil
-      end
-
-      key ||= @prefix_stack.join('.')
-    end
-
-    def set(key, value, group = nil)
-      group ||= @group
-      key = final_key(key)
-
-      @dataset.insert(:key => key, :value => value, :group => group)
-
-      stack_pop
-    end
-
-    def delete_key(key, group = nil)
-      group ||= @group
-
-      key = final_key(key)
-
-      @dataset.filter(:key => key, :group => group).delete
-      stack_pop
-    end
-
     def update(key, value, group = nil)
       group ||= @group
       key = final_key(key)
@@ -79,10 +46,6 @@ module Dotdot
       stack_pop
     end
 
-    def stack_pop
-      @prefix_stack.pop
-    end
-
     def has_key?(key, group)
       group ||= @object.group.to_s
 
@@ -144,6 +107,47 @@ module Dotdot
       end
     end
 
+    def set(key, value, group = nil)
+      group ||= @group
+      key = final_key(key)
+
+      @dataset.insert(:key => key, :value => value, :group => group)
+
+      stack_pop
+    end
+
+    private
+
+    def final_key(key)
+      unless @prefix_stack.empty?
+        @prefix_stack.push(key)
+        key = nil
+      end
+
+      key ||= @prefix_stack.join('.')
+    end
+
+    def boot
+      @database = Sequel.sqlite(@object.db_path, @sql_options)
+      @group = ""
+      @prefix_stack = []
+
+      @dataset = @database[:cablingdatas]
+    end
+
+    def delete_key(key, group = nil)
+      group ||= @group
+
+      key = final_key(key)
+
+      @dataset.filter(:key => key, :group => group).delete
+      stack_pop
+    end
+
+    def stack_pop
+      @prefix_stack.pop
+    end
+
     def create_table_if_needed
       if @database.tables.include? :cablingdatas
         @database.drop_table :cablingdatas

data/lib/dotdot/version.rb

@@ -1,3 +1,3 @@
 module Dotdot
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotdot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3