filebase 0.2.1 → 0.3.4

data/lib/drivers/yaml.rb

@@ -5,19 +5,21 @@ class Filebase
   class YAML
     
     def initialize( root )
-      @root = root
+      @root = root.to_s
     end
     
   	def path( key )
-  		@root / key + '.yml'
+  	  File.join( @root, key.to_s ) + '.yml'
   	end
   	
   	def all
-  	  Dir[ path('*') ].map { |file| YAML.load( File.read( file ) ) }
+  	  Dir[ path('*') ].map { |file| find( File.basename(file,'.yml' ) ) }.compact
   	end
     
     def find( key )
-  		( ::YAML.load( File.read( path( key ) ) ) if File.exists?( path( key ) ) ) || nil
+  		obj = ::YAML.load( File.read( path( key ) ) ) rescue nil
+  		obj['key'] = key if Hash === obj
+  		obj or nil # convert false to nil
   	end
   	
   	def save( key, object )

data/lib/filebase/attributes.rb

@@ -1,47 +1,43 @@
 module Attributes
   
-	def initialize(hash = {} )
-	  attributes = hash
-	end
+	def initialize( hash = {} ) ; self.attributes = hash ; end
 	
 	def attributes=( hash )
 	  # copy the hash, converting all keys to strings
 		@attrs = hash.inject({}) { |h,p| k,v = p; h[k.to_s] = v; h  }
 	end
 	
-	def attributes
-	  @attrs ||= {}
-	end
+	def attributes ; @attrs ||= {} ; end
+	
+	def has_key?( key ) ; attributes.has_key?( key.to_s ) ; end
+	
+	def delete( key ) ; attributes.delete( key.to_s ) ; end
 	
 	def method_missing(name,*args)
 	  name = name.to_s
-		if name =~/=$/ and args.length == 1
-			set(name[0..-2], args[0] )
-		else
-			get(name)
+	  case args.length
+    when 0 then get( name )
+    when 1
+      if name[-1,1] == '=' 
+        set( name[0..-2], args[0] )
+      else
+        super
+      end
+    else super
 		end
 	end
 	
-	def [](name)
-		get(name)
-	end
+	def [](name) ; get(name) ; end
 	
-	def []=(name,val)
-		set(name,val)
-	end
+	def []=(name,val) ; set(name,val) ; end
 	
-	def set(name, val)
-		attributes[name.to_s] = val
-	end
+	def set(name, val) ; attributes[name.to_s] = val ; end
 	
 	def get(name)
-		rval = attributes[name.to_s]
-		rval.is_a?( Hash ) ? Attributes.new( rval ) : rval
+		( ( rval = attributes[name.to_s] ).is_a?( Hash ) and attributes[name.to_s] = self.class.new( rval ) ) or rval
 	end
 	
-	def to_h
-		@attrs
-	end
+	def to_h ; @attrs ; end
 	
   alias_method :to_hash, :to_h
   

data/lib/filebase/model.rb

@@ -25,7 +25,8 @@ class Filebase
 		    attr_accessor :db
 		    def create( assigns ) ; save( new( assigns ) ) ; end
 		    def all ; db.all.map { |attrs| new( attrs ) } ; end
-		    def find( key ) ; attrs = db.find( key ); new( attrs.merge( :key => key ) ) if attrs ; end
+		    def find( key ) ; attrs = db.find( key ); new( attrs ) if attrs ; end
+		    def []( key ) ; find( key ) ; end
 		    def save( object )
 		      raise( Filebase::Error.new, 'attempted to save an object with nil key' ) if object.key.nil? or object.key.empty?
           db.save( object.key, object.to_h )
@@ -38,7 +39,7 @@ class Filebase
 		      module_eval do
 		        define_method name do
   		        @has_one ||= {}
-    		      options[:class] ||= Object.module_eval( name.to_s.camel_case )
+    		      options[:class] ||= Object.module_eval( name.to_s.gsub(/(_)(\w)/) { $2.upcase }.gsub(/^([a-z])/) { $1.upcase } )
 		          @has_one[name] ||= options[:class].find( get( name ) ) 
 		        end
 		        define_method( name.to_s + '=' ) do | val |
@@ -72,6 +73,8 @@ class Filebase
         def save ; self.class.save( self ) ; self; end
         def delete ; self.class.delete( self ) ; self ; end
         def ==(object) ; key == object.key ; end
+        def eql?(object) ; key == object.key ; end
+        def hash ; key.hash ; end
       end
 
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: filebase
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.4
 platform: ruby
 authors: 
 - Dan Yoder