activefolder 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d723e1b9eb722d530100fd75e13a97d744dd2e52
-  data.tar.gz: 546326b52d4274cbe274f6584634ed0856b92d0c
+  metadata.gz: 672923824f8c9bb60475ac9af213cf362be4e30b
+  data.tar.gz: c55bf99d599342d2c2c7a6ae1a135967ac0ec853
 SHA512:
-  metadata.gz: 24c74a9e783e9eae1507936258a53f6d8807d012c3a88d2a870aef9940a5d99c80b96498c878a790e891102875e6056bd37b27d3c5d9cf9f0d5f337dbb888008
-  data.tar.gz: 439e64fc90e91311a24f5779130e0f0023e98a13b3d249b94b8c278d25a39d70efb2935878782ed46143d82014addaa3f7075b17fec0559681eaad1adceed516
+  metadata.gz: f55e4bdc4715481851750015292af632a6c60cb0dc5cb4cf3fe2c3774a6453b1c4662c90b700e250a3b03f8dfaad43e0b25edfbf14813534f21f0ef52084917a
+  data.tar.gz: 1befdaa45138de136cc29a03bb08eebbef408cc1a021fa09f601c35379c3e65eaa78f795ac02b2f6817047ae3b77c6cdbb24bc39f4e9b120d57ebd60e42e5a85

data/lib/active_folder/metal/adapters/{bare.rb → local.rb}

@@ -5,12 +5,12 @@ require 'active_folder/metal/errors'
 module ActiveFolder
   module Metal
     module Adapters
-      class Bare
-        def initialize(connection)
-          @root = connection.root_path
+      class Local
+        def initialize(config)
+          @config = config
         end
 
-        def read(path:)
+        def read(path)
           File.read full_path(path)
         rescue Errno::ENOENT => e
           raise NotFoundError.new(e)
@@ -18,35 +18,39 @@ module ActiveFolder
           raise SystemError.new(e)
         end
 
-        def write(path:, data:)
-          dir = File.dirname full_path(path)
-          FileUtils.mkdir_p dir
+        def write(path, data)
           File.write(full_path(path), data)
         rescue SystemCallError => e
           raise SystemError.new(e)
         end
 
-        def glob(path:)
-          paths = Dir.glob full_path(path)
-          paths.map { |p| relative_path(p) }
+        def mkdir_p(path)
+          FileUtils.mkdir_p full_path(path)
         rescue SystemCallError => e
           raise SystemError.new(e)
         end
 
-        def del(path:)
+        def rm_r(path)
           FileUtils.rm_r full_path(path)
         rescue SystemCallError => e
           raise SystemError.new(e)
         end
 
+        def glob(path)
+          paths = Dir.glob full_path(path)
+          paths.map { |p| relative_path(p) }
+        rescue SystemCallError => e
+          raise SystemError.new(e)
+        end
+
         private
 
         def full_path(path)
-          File.join(@root, path)
+          File.join(@config.root_path, path)
         end
 
         def relative_path(path)
-          path.sub(@root, '')
+          path.sub(@config.root_path, '')
         end
       end
     end

data/lib/active_folder/metal/client.rb

@@ -1,46 +1,33 @@
-require 'active_folder/metal/adapters/bare'
-require 'active_folder/metal/connections/bare'
-require 'active_folder/metal/connections/git'
+require 'active_folder/metal/adapters/local'
 
 module ActiveFolder
   module Metal
     class Client
       def initialize(config)
         @config = config
-        @connection = connect(config)
       end
 
-      def load(**args)
-        adapter.read(**args)
+      def load(path:)
+        adapter.read(path)
       end
 
-      def save(**args)
-        adapter.write(**args)
+      def save(path:, data:)
+        adapter.mkdir_p File.dirname(path)
+        adapter.write(path, data)
       end
 
-      def glob(**args)
-        adapter.glob(**args)
+      def glob(path:)
+        adapter.glob(path)
       end
 
-      def del(**args)
-        adapter.del(**args)
-      end
-
-      def connection
-        @connection
+      def del(path:)
+        adapter.rm_r(path)
       end
 
       private
 
-      def connect(config)
-        case config.root_path
-          when :git then Connections::Git.new(config)
-          else Connections::Bare.new(config)
-        end
-      end
-
       def adapter
-        @adapter ||= Adapters::Bare.new(connection)
+        Adapters::Local.new(@config)
       end
     end
   end

data/lib/active_folder/metal/config.rb

@@ -1,11 +1,28 @@
+require 'rugged'
+
+require 'active_folder/metal/errors'
+
 module ActiveFolder
   module Metal
     class Config
-      attr_accessor :root_path
+      attr_writer :root_path
 
       def initialize
         self.root_path = '.'
       end
+
+      def root_path
+        @root_path != :git ? @root_path :
+          rugged.discover(Dir.pwd)
+      rescue Rugged::RepositoryError => e
+        raise SystemError.new(e)
+      end
+
+      private
+
+      def rugged
+        Rugged::Repository
+      end
     end
   end
 end

data/lib/active_folder/model/traits/discovery.rb

@@ -5,7 +5,7 @@ module ActiveFolder
         extend ActiveSupport::Concern
 
         class_methods do
-          def current(path = nil)
+          def find_by_path(path)
             pathname = Pathname.new(path)
 
             dir = pathname.ascend do |file|

data/lib/active_folder/model/traits/enumeration.rb

@@ -12,32 +12,22 @@ module ActiveFolder
         end
 
         def all(name = '*')
-          element = File.join(model_name, name)
-          query = File.join(model_base_dir, '**', element)
+          query_suffix = File.join(model_name, name)
+          query = File.join(model_base_dir, '**', query_suffix)
 
           paths = ActiveFolder.client.glob(path: query)
           paths.map { |path| model_class.load(path) }
         end
 
-        def last
-          all.last
-        end
-
-        def first
-          all.first
-        end
+        def last; all.last end
+        def first; all.first end
 
-        def to_a
-          all
-        end
+        def count; all.count end
+        def to_a; all end
 
         def where(**args)
           all.select { |element| args.match(element) }
         end
-
-        def count
-          all.count
-        end
       end
     end
   end

data/lib/active_folder/model/traits/relation.rb

@@ -11,7 +11,6 @@ module ActiveFolder
       module Relation
         using Utilities::Symbol
         extend ActiveSupport::Concern
-
         include Discovery
 
         class_methods do
@@ -23,7 +22,7 @@ module ActiveFolder
 
           def belongs_to element
             define_method element do
-              element.to_class.current(self.path)
+              element.to_class.find_by_path(self.path)
             end
           end
 

data/lib/active_folder/model/utilities/collection.rb

@@ -8,12 +8,12 @@ module ActiveFolder
         using Utilities::Symbol
         include Model::Traits::Collection
 
-        def initialize(owner, collection)
-          @owner = owner; @collection = collection
+        def initialize(owner, name)
+          @owner = owner; @name = name
         end
 
-        def model_class; @collection.to_class end
-        def model_name; @collection.to_s end
+        def model_class; @name.to_class end
+        def model_name; @name.to_s end
         def model_base_dir; @owner.path end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefolder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Thorner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,11 +41,9 @@ files:
 - lib/active_folder/base.rb
 - lib/active_folder/config.rb
 - lib/active_folder/errors.rb
-- lib/active_folder/metal/adapters/bare.rb
+- lib/active_folder/metal/adapters/local.rb
 - lib/active_folder/metal/client.rb
 - lib/active_folder/metal/config.rb
-- lib/active_folder/metal/connections/bare.rb
-- lib/active_folder/metal/connections/git.rb
 - lib/active_folder/metal/errors.rb
 - lib/active_folder/metal/files/text.rb
 - lib/active_folder/metal/files/yaml.rb

data/lib/active_folder/metal/connections/bare.rb

@@ -1,15 +0,0 @@
-module ActiveFolder
-  module Metal
-    module Connections
-      class Bare
-        def initialize(config)
-          @config = config
-        end
-
-        def root_path
-          @config.root_path
-        end
-      end
-    end
-  end
-end

data/lib/active_folder/metal/connections/git.rb

@@ -1,23 +0,0 @@
-require 'rugged'
-
-module ActiveFolder
-  module Metal
-    module Connections
-      class Git
-        def initialize(config)
-          @config = config
-        end
-
-        def root_path
-          rugged.discover(Dir.pwd)
-        rescue Rugged::RepositoryError => e
-          raise SystemError.new(e)
-        end
-
-        private
-
-        def rugged; Rugged::Repository end
-      end
-    end
-  end
-end