ro 1.2.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjU3NjMzOGVkNmQyZDFmNzk0MjBlOTc1MjRiYTFjYzhhOTFjM2E3NA==
+    NWFhMGNiNGMwNGRjYWYxZDg1NjgyMzgxMDQ4ZDIwZmY4Y2VjMjk5Nw==
   data.tar.gz: !binary |-
-    ZWNmMmIyZjcwNTJkYmU0ZDJkZTYwZGYwYjE4MWEyZDdiMmM5Y2ZkMQ==
+    ODUyOWE1NGMwZTNiZmJkZWU3ODI5MzU2NDUwYWZkZDMzYTZjZDAwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjUxM2JkYjg5OTMxODM3ZGVmYjBhYjgwOTc3ZTFlYjY4N2FiNTQyMDc3ZDUz
-    M2FmNWQxMTMzYjk4NjlhYzIxYTcwYTQ3MTM2ODA0NDEwNzY2YjI2YWJiM2Ey
-    MzQzMTI5ZTE2MjZhMTE0Mjg0ZTNiZWY3OTdiNWYzYzk4ODA4MDA=
+    ZmQ2YjQwMmIyODQwOTA1OWM3YTQwYzhhNTVjOWM0OTBkOGE1YTZhNmViZWU3
+    ZGU0ZDZkOGYwMTRmYTJiMTQ3ZGJlYmI1Y2RkOTQyYTQxNzA4ZDBiZTY2YTQy
+    MDhiZjIzNDNkNjM3ZWNlYWUyYzA4ZmIwNTU4YTljZjVmZTlkODc=
   data.tar.gz: !binary |-
-    NWRkODVlNDYzY2I4NzA4N2Q1ZDM5MTNhYzc1OTU1YWE5MjQ5NWMxZGUwOTZk
-    YzA0MmJhNjdmNjg1ZjBhNTIxN2QwNzA1M2Q4ZWZkMmQ3ZDJlYjFmYmYwZjA4
-    M2VmZDlkZjY2ZWMyMTBhYjdlYzI0NTU2NWE5MDg5MTE4OTIwYmY=
+    MzY5MTQ4ZjNhOWExMTMyNGI3MTE5NzIzYTAxY2EzMTIxYjc1NjdkYzgwYjFm
+    NGU2MjA5Mzc0OTFmMDIyNTYyMmRkYWFhOGFmMDJiZmUwYmQ0MmM3ZTNlNDAz
+    MDU4MTExMzg1Yjg3NTUyZjhkNzUzOTZhNjg0MjI1ZmVhY2VkOWM=

data/lib/ro.rb

@@ -10,7 +10,7 @@
 
 #
   module Ro
-    Version = '1.2.0' unless defined?(Version)
+    Version = '1.3.1' unless defined?(Version)
 
     def version
       Ro::Version
@@ -311,6 +311,7 @@
     root.rb
     lock.rb
     git.rb
+    pagination.rb
 
     cache.rb
 

data/lib/ro/model.rb

@@ -58,23 +58,55 @@ module Ro
       all.last
     end
 
-    def Model.find(*args, &block)
-      models_for(nodes.find(*args, &block))
+    def Model.find(id)
+      re = %r/#{ id.to_s.gsub(/[-_]/, '[-_]') }/i
+      all.detect{|model| model.id.to_s == id.to_s}
     end
 
-    def Model.paginate(*args, &block)
-      models_for(nodes.paginate(*args, &block))
+    def Model.[](id)
+      find(id)
+    end
+
+    def Model.method_missing(method, *args, &block)
+      id = method
+      model = find(id)
+      return model if model
+      super
     end
 
     def Model.models_for(result)
       case result
         when Array
-          Array(result).flatten.compact.map{|element| new(element)}
+          List.for(Array(result).flatten.compact.map{|element| new(element)})
         else
           new(result)
       end
     end
 
+    def Model.paginate(*args, &block)
+      all.paginate(*args, &block)
+    end
+
+    class List < ::Array
+      include Pagination
+
+      def List.for(*args, &block)
+        new(*args, &block)
+      end
+
+      def select(*args, &block)
+        List.for super
+      end
+
+      def detect(*args, &block)
+        super
+      end
+    end
+
+    def List(*args, &block)
+      List.new(*args, &block)
+    end
+
   #
     attr_accessor(:node)
 
@@ -144,7 +176,7 @@ if __FILE__ == $0
   p ara.id
   p ara.first_name
 
-  require 'pry'
-  binding.pry
+require 'pry'
+binding.pry
 
 end

data/lib/ro/node.rb

@@ -2,14 +2,14 @@ module Ro
   class Node
     fattr :root
     fattr :path
-    fattr :name
     fattr :type
     fattr :loaded
     fattr :fields
 
     def initialize(path)
       @path = Ro.realpath(path.to_s)
-      @name = File.basename(@path)
+      @id   = File.basename(@path)
+      @slug = Slug.for(@id)
       @type = File.basename(File.dirname(@path))
       @root = Ro::Root.new(File.dirname(File.dirname(@path)))
       @loaded = false
@@ -19,15 +19,47 @@ module Ro
     end
 
     def id
-      @name
+      @id
+    end
+
+    def _id
+      @id
+    end
+
+    def type
+      attributes[:type] || @type
+    end
+
+    def _type
+      @type
+    end
+
+    def path
+      attributes[:path] || @path
+    end
+
+    def _path
+      @path
     end
 
     def slug
-      attributes[:slug] || id
+      attributes[:slug] || @slug
+    end
+
+    def _slug
+      @slug
     end
 
     def identifier
-      "#{ type }/#{ name }"
+      "#{ _type }/#{ _id }"
+    end
+
+    def hash
+      identifier.hash
+    end
+
+    def ==(other)
+      attributes == other.attributes
     end
 
     def inspect
@@ -67,13 +99,43 @@ module Ro
     end
 
     def assets
-      asset_paths.map do |asset|
-        asset.sub(asset_dir + "/", "")
+      asset_paths.map do |path|
+        name = path.sub(asset_dir + "/", "")
+        url = url_for(name)
+        Asset.new(name, :path => path, :url => url)
       end
     end
 
     def asset_urls
-      asset_names.map{|asset_name| url_for(asset_name)}
+      assets.map(&:url)
+    end
+
+    class Asset < ::String
+      fattr(:path)
+      fattr(:url)
+
+      def initialize(name, options = {})
+        super(name)
+      ensure
+        options = Map.for(options)
+
+        Asset.fattrs.each do |attr|
+          if options.has_key?(attr)
+            value = options[attr]
+            send(attr, value)
+          end
+        end
+      end
+
+      def name
+        self
+      end
+
+      IMAGE_RE = %r/[.](jpg|jpeg|png|gif|tif|tiff)$/i
+
+      def image?
+        !!(self =~ IMAGE_RE)
+      end
     end
 
     def url_for(*args, &block)
@@ -171,6 +233,10 @@ module Ro
     def attributes
       _load{ @attributes }
     end
+
+    def attributes=(attributes)
+      @attributes = attributes
+    end
     
     def instance_eval(*args, &block)
       _load{ super }
@@ -224,6 +290,10 @@ module Ro
       attributes
     end
 
+    def load!(&block)
+      _load(&block)
+    end
+
     def _load(&block)
       unless @loaded
         if @loading

data/lib/ro/node/list.rb

@@ -57,12 +57,12 @@ module Ro
           when String, Symbol
             if @type.nil?
               type = key.to_s
-              list = select{|node| type == node.type}
+              list = select{|node| type == node._type}
               list.type = type
               list
             else
-              name = Slug.for(key.to_s)
-              detect{|node| name == node.name}
+              id = Slug.for(key.to_s)
+              detect{|node| id == node.id}
             end
           else
             super(*args, &block)
@@ -82,9 +82,9 @@ module Ro
             select{|node| node.instance_eval(&block)}
 
           when !args.empty?
-            names = args.flatten.compact.uniq.map{|arg| arg.to_s}
-            index = names.inject(Hash.new){|h,name| h.update(name => name)}
-            select{|node| index[node.name]}
+            ids = args.flatten.compact.uniq.map{|arg| Slug.for(arg.to_s)}
+            index = ids.inject(Hash.new){|h,id| h.update(id => id)}
+            select{|node| index[node.id]}
 
           else
             raise ArgumentError.new
@@ -99,8 +99,8 @@ module Ro
             detect{|node| node.instance_eval(&block)}
 
           when args.size == 1
-            name = args.first.to_s
-            detect{|node| node.name == name}
+            id = args.first.to_s
+            detect{|node| node.id == id}
 
           when args.size > 1
             where(*args, &block)
@@ -114,71 +114,7 @@ module Ro
         [root, type].compact.join('/')
       end
 
-      def paginate(*args)
-        options = Map.options_for!(args)
-
-        ensure_pagination_state!
-
-        page = Integer(args.shift || options[:page] || @page)
-        per = Integer(args.shift || options[:per] || options[:size] || @per)
-
-        @page = [page.abs, 1].max
-        @per = [per.abs, 1].max
-
-        offset = (@page - 1) * @per
-        length = @per 
-
-        replace(self.slice(offset, length))
-
-        self
-      end
-
-      def page(*args)
-        ensure_pagination_state!
-
-        if args.empty?
-          return @page
-        else
-          options = Map.options_for!(args)
-          page = args.shift || options[:page]
-          options[:page] = page
-          paginate(options)
-        end
-      end
-
-      alias_method(:current_page, :page)
-
-      def per(*args)
-        ensure_pagination_state!
-
-        if args.empty?
-          return @per
-        else
-          options = Map.options_for!(args)
-          per = args.shift || options[:per]
-          options[:per] = per
-          paginate(options)
-        end
-      end
-
-      def num_pages
-        (size.to_f / per).ceil
-      end
-
-      def total_pages
-        num_pages
-      end
-
-      def ensure_pagination_state!
-        unless defined?(@page)
-          @page = 1
-        end
-        unless defined?(@per)
-          @per = size
-        end
-        [@page, @per]
-      end
-
+      include Pagination
 
       def method_missing(method, *args, &block)
         Ro.log "Ro::List(#{ identifier })#method_missing(#{ method.inspect }, #{ args.inspect })"

data/lib/ro/pagination.rb

@@ -0,0 +1,54 @@
+module Ro
+  module Pagination
+    def paginate(*args)
+      options = Map.options_for!(args)
+
+      page = Integer(args.shift || options[:page] || 1)
+      per = Integer(args.shift || options[:per] || options[:size] || 10)
+
+      page = [page.abs, 1].max
+      per = [per.abs, 1].max
+
+      offset = (page - 1) * per
+      length = per 
+
+      slice = dup.slice(offset, length)
+      slice.page = page
+      slice.per = per
+      slice.num_pages = (size.to_f / per).ceil
+      slice
+    end
+
+    def page=(page)
+      @page = page
+    end
+
+    def page(*args)
+      @page
+    end
+
+    def current_page
+      @page
+    end
+
+    def per=(per)
+      @per = per
+    end
+
+    def per
+      @per
+    end
+
+    def num_pages=(num_pages)
+      @num_pages = num_pages
+    end
+
+    def num_pages
+      @num_pages
+    end
+
+    def total_pages
+      num_pages
+    end
+  end
+end

data/ro.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "ro"
-  spec.version = "1.2.0"
+  spec.version = "1.3.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "ro"
   spec.description = "description: ro kicks the ass"
@@ -24,6 +24,7 @@ Gem::Specification::new do |spec|
  "lib/ro/model.rb",
  "lib/ro/node.rb",
  "lib/ro/node/list.rb",
+ "lib/ro/pagination.rb",
  "lib/ro/root.rb",
  "lib/ro/slug.rb",
  "lib/ro/template.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -157,6 +157,7 @@ files:
 - lib/ro/model.rb
 - lib/ro/node.rb
 - lib/ro/node/list.rb
+- lib/ro/pagination.rb
 - lib/ro/root.rb
 - lib/ro/slug.rb
 - lib/ro/template.rb