activefolder 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c797caee9bc346c2117c06b66e00541b7526c7a
-  data.tar.gz: 54c7374922603db20c35ac5e6212f5c55d446e60
+  metadata.gz: 020e30e40612918e0063d5fa36fb3aff3c293eed
+  data.tar.gz: 8e382664812b53c6ec4d315d9d43096e4a62bbb4
 SHA512:
-  metadata.gz: ead8a1ac4b1b0c938e06432841dcdaf40db5112ccda118f1ee22009ff865a55b5ae45ba9eab2b69000d9fc11a415029114e4d1ca6771a93bb3a91e83d64d8bb1
-  data.tar.gz: 999b3312d5c2484c00c833e7ca14fedd6c332e05cf08f5bff6784fcd5cd31d1cae9187bfcbcf4e3350292346f2d2ffb80283e51459ab5f5de0b5824d95b09058
+  metadata.gz: c1a8ef1fc3d7553f8c3f6164faa1049e880efa319271ba21e6a49b3aa74e580354debd83e0c539fb950af8adb61be85e200eb8c3b3577fc8d8e8d616f8d346e4
+  data.tar.gz: 552e0b30ee18334dbd48092dbbaacb074661e7f546235ebf2c141d6d259dc3b668d24ad3d75d77ce9a7582d733f4f2e712cf4657815caae7383761cdb066fb26

data/lib/active_folder/metal/client.rb

@@ -1,11 +1,13 @@
 require 'active_folder/metal/adapters/bare'
 require 'active_folder/metal/connections/bare'
+require 'active_folder/metal/connections/git'
 
 module ActiveFolder
   module Metal
     class Client
       def initialize(config)
         @config = config
+        @connection = connect(config)
       end
 
       def load(**args)
@@ -20,14 +22,21 @@ module ActiveFolder
         adapter.glob(**args)
       end
 
+      def connection
+        @connection
+      end
+
       private
 
-      def adapter
-        @adapter ||= Adapters::Bare.new(connection)
+      def connect(config)
+        case config.root_path
+          when :git then Connections::Git.new(config)
+          else Connections::Bare.new(config)
+        end
       end
 
-      def connection
-        @connection ||= Connections::Bare.new(@config)
+      def adapter
+        @adapter ||= Adapters::Bare.new(connection)
       end
     end
   end

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

@@ -9,6 +9,10 @@ module ActiveFolder
         def root_path
           @config.root_path
         end
+
+        def current_path
+          Dir.pwd
+        end
       end
     end
   end

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

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

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

@@ -6,17 +6,25 @@ module ActiveFolder
       module Collection
         include Enumeration
 
-        def build(**args)
+        def build(args, &block)
           dir = File.join(model_base_dir, model_name)
-          model_class.new(**args.merge(base_dir: dir))
+          args = args.merge(base_dir: dir)
+
+          instance = model_class.new(args)
+          yield instance if block_given?; instance
+        end
+
+        def create(args, &block)
+          instance = build(args, &block);
+          instance.save!; instance
         end
 
-        def create(**args)
-          instance = build(**args); instance.save!; instance
+        def find_or_create(args, &block)
+          find(args[:name]) || create(args, &block)
         end
 
-        def find_or_create(**args)
-          find(args[:name]) || create(**args)
+        def find_or_initialize(args, &block)
+          find(args[:name]) || build(args, &block)
         end
       end
     end

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

@@ -0,0 +1,26 @@
+module ActiveFolder
+  module Model
+    module Traits
+      module Discovery
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def current(path = nil)
+            client = ActiveFolder.client
+            connection = client.connection
+
+            path ||= connection.current_path
+            pathname = Pathname.new(path)
+
+            dir = pathname.ascend do |file|
+              parent_dir = file.parent.basename.to_s
+              break(file) if parent_dir == model_name
+            end
+
+            model_class.load(dir) if dir
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -34,6 +34,10 @@ module ActiveFolder
         def where(**args)
           all.select { |element| args.match(element) }
         end
+
+        def count
+          all.count
+        end
       end
     end
   end

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

@@ -3,6 +3,7 @@ require 'pathname'
 require 'active_folder/model/utilities/collection'
 require 'active_folder/model/utilities/symbol'
 require 'active_folder/metal/files/text'
+require 'active_folder/model/traits/discovery'
 
 module ActiveFolder
   module Model
@@ -11,6 +12,8 @@ module ActiveFolder
         using Utilities::Symbol
         extend ActiveSupport::Concern
 
+        include Discovery
+
         class_methods do
           def has_many collection
             define_method collection do
@@ -42,17 +45,6 @@ module ActiveFolder
               link_file(element).save(value.path)
             end
           end
-
-          def current(path = Dir.pwd)
-            pathname = Pathname.new(path)
-
-            dir = pathname.ascend do |file|
-              parent_dir = file.parent.basename.to_s
-              break(file) if parent_dir == model_name
-            end
-
-            model_class.load(dir) if dir
-          end
         end
       end
     end

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

@@ -10,12 +10,16 @@ module ActiveFolder
         included do
           def load!
             attrs = attributes_file.load
-            raise TypeError.new(attrs) unless attrs.respond_to?(:each_pair)
-            attrs.each { |k,v| self[k] = v }
+            attrs.each_pair do |key,val|
+              self[key] = val
+            end
+
+            self
           end
 
           def save!
             attributes_file.save(attributes)
+            self
           end
 
           def update!(**args)

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

@@ -8,6 +8,10 @@ module ActiveFolder
           def match(object); self == object end
         end
 
+        refine Range do
+          def match(object); member?(object) end
+        end
+
         refine Hash do
           def match(object)
             keys.all? do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefolder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Thorner
@@ -30,7 +30,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
-description: A file system ORM
+description: A file system ORM based on ActiveRecord. Objects are files, relations
+  are folders.
 email: benthorner@outlook.com
 executables: []
 extensions: []
@@ -44,11 +45,13 @@ files:
 - 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
 - lib/active_folder/model/errors.rb
 - lib/active_folder/model/traits/collection.rb
+- lib/active_folder/model/traits/discovery.rb
 - lib/active_folder/model/traits/enumeration.rb
 - lib/active_folder/model/traits/has_belongs.rb
 - lib/active_folder/model/traits/persistence.rb
@@ -78,5 +81,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Active Folder
+summary: A file system ORM based on ActiveRecord.
 test_files: []