ro 1.1.1 → 1.2.0

data/lib/ro/root.rb

@@ -26,5 +26,27 @@ module Ro
     def node_directories(&block)
       Dir.glob(File.join(root, '*/*/'), &block)
     end
+
+    def git
+      @git ||= Git.new(self)
+    end
+
+    def patch(*args, &block)
+      git.patch(*args, &block)
+    end
+
+    def dotdir
+      File.join(self, '.ro')
+    end
+
+    def lockpath
+      File.join(dotdir, 'lock')
+    end
+
+    def lock(&block)
+      FileUtils.mkdir_p(File.dirname(lockpath))
+      @lock ||= Lock.new(lockpath)
+      block ? @lock.lock(&block) : @lock
+    end
   end
 end

data/lib/ro/slug.rb

@@ -8,6 +8,7 @@ module Ro
       string = args.flatten.compact.join(join)
       string = unidecode(string)
       words = string.to_s.scan(%r|[/\w]+|)
+      words.map!{|word| word.gsub %r|[_-]|, join}
       words.map!{|word| word.gsub %r|[^/0-9a-zA-Z_-]|, ''}
       words.delete_if{|word| word.nil? or word.strip.empty?}
       new(words.join(join).downcase.gsub('/', (join * 2)))

data/lib/ro/template.rb

@@ -14,11 +14,18 @@ module Ro
         case ext.to_s.downcase
           when 'erb', 'eruby'
             content = Ro.erb(content, node)
+
           when 'yml'
             content = YAML.load(content)
+
           else
-            tilt = Tilt[ext].new{ content  }
-            content = tilt.render(node)
+            tilt = Tilt[ext] || Tilt['txt']
+
+            if tilt.nil?
+              content
+            else
+              content = tilt.new{ content }.render(node)
+            end
         end
       end
 
@@ -39,7 +46,12 @@ module Ro
         if exts.empty?
           code = content
           language = ext
-          content = ::Pygments.highlight(code, :lexer => language, :options => {:encoding => 'utf-8'})
+          content = 
+            begin
+              ::Pygments.highlight(code, :lexer => language, :options => {:encoding => 'utf-8'})
+            rescue
+              content
+            end
         else
           case ext.to_s.downcase
             when 'erb', 'eruby'

data/notes/ara.txt

@@ -1,4 +1,123 @@
+
+
+- nodes have fields
+  - fields know from whence them came
+
+- how to paginate collections
+
+  Source.all.page(2).per(10)
+
+- find by name/slug
+
+  Source.find(name)
+
+  source.save(message)
+
+  editing...
+
+
+
 todo:
+
+  - nodes can be edited
+    - assume git
+    - know from whence all data came
+      - @loaded[path] => key 
+    -
+      maybe just node.save!(message)
+
+        loop do
+
+          # commit
+          git add --all .
+          git commit -m message -- .
+
+          git reset --hard OR git checkout -f
+          retry
+
+        end
+
+
+
+        loop
+
+          git push
+
+            git pull
+
+              # publish
+              git checkout --ours -- .
+              git add --all .
+              git commit -F .git/MERGE_MSG
+              git push
+
+        end
+
+
+    - ./assets
+
+    - @attributes, @sources, @urls
+
+
+  - ro::model
+
+      class Post < Ro::Model
+        root 'ro'
+
+        directory 'posts'
+
+        attributes(
+        )
+
+        files(
+          'bio.md.erb'
+        )
+
+        assets(
+          'logo.jpg'
+        )
+
+        sources(
+          'a.rb'
+        )
+
+        schema {
+
+          attribute :first_name
+          attribute :last_name
+          
+          template 'bio.html.erb'
+
+        }
+
+          :attributes => {
+            :first_name => nil,
+          },
+
+          'templates' => {
+            'bio.html.erb'
+          },
+
+          assets
+        )
+
+        def Post.find(*args)
+        end
+
+        def Post.where(*args)
+        end
+
+        def save
+          saved = (
+            save_attributes &&
+            save_files &&
+            save_assets &&
+            save_sources
+            commit
+          )
+        end
+      end
+
   - helper/model extension ?
 
       Ro.helper(:posts) do

data/ro.gemspec

@@ -3,64 +3,32 @@
 
 Gem::Specification::new do |spec|
   spec.name = "ro"
-  spec.version = "1.1.1"
+  spec.version = "1.2.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "ro"
   spec.description = "description: ro kicks the ass"
   spec.license = "Same As Ruby's"
 
   spec.files =
-[":",
- ":w",
- "=p",
- "README.md",
+["README.md",
  "Rakefile",
- "bin",
+ "TODO.md",
  "bin/ro",
- "lib",
- "lib/co",
- "lib/co/db.rb",
- "lib/co/node",
- "lib/co/node.rb",
- "lib/co/node/list.rb",
- "lib/co/util.rb",
- "lib/lib",
- "lib/ro",
  "lib/ro.rb",
  "lib/ro/blankslate.rb",
  "lib/ro/cache.rb",
- "lib/ro/db",
- "lib/ro/db/collection",
- "lib/ro/initializers",
+ "lib/ro/git.rb",
  "lib/ro/initializers/env.rb",
  "lib/ro/initializers/tilt.rb",
- "lib/ro/node",
+ "lib/ro/lock.rb",
+ "lib/ro/model.rb",
  "lib/ro/node.rb",
  "lib/ro/node/list.rb",
  "lib/ro/root.rb",
  "lib/ro/slug.rb",
  "lib/ro/template.rb",
- "notes",
  "notes/ara.txt",
- "ro",
- "ro.gemspec",
- "ro/people",
- "ro/people/ara",
- "ro/people/ara/assets",
- "ro/people/ara/assets/ara-glacier.jpg",
- "ro/people/ara/assets/source",
- "ro/people/ara/assets/source/a.rb",
- "ro/people/ara/attributes.yml",
- "ro/people/ara/bio.md.erb",
- "ro/people/noah",
- "ro/people/noah/attributes.yml",
- "ro/posts",
- "ro/posts/hello-world",
- "ro/posts/hello-world/attributes.yml",
- "ro/posts/hello-world/body.md",
- "ro/posts/second-awesome-post",
- "ro/posts/second-awesome-post/attributes.yml",
- "ro/posts/second-awesome-post/body.md"]
+ "ro.gemspec"]
 
   spec.executables = ["ro"]
   
@@ -73,7 +41,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["fattr", " >= 2.2.1"])
   
-    spec.add_dependency(*["tilt", " >= 1.4.1"])
+    spec.add_dependency(*["tilt", " >= 1.3.1"])
   
     spec.add_dependency(*["pygments.rb", " >= 0.5.0"])
   
@@ -81,6 +49,12 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["stringex", " >= 2.1.0"])
   
+    spec.add_dependency(*["systemu", " >= 2.5.2"])
+  
+    spec.add_dependency(*["nokogiri", " >= 1.6.1"])
+  
+    spec.add_dependency(*["main", " >= 5.2.0"])
+  
 
   spec.extensions.push(*[])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,48 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: systemu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: main
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 5.2.0
 description: ! 'description: ro kicks the ass'
 email: ara.t.howard@gmail.com
 executables:
@@ -101,20 +143,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ! ':'
-- ':w'
 - README.md
 - Rakefile
+- TODO.md
 - bin/ro
-- lib/co/db.rb
-- lib/co/node.rb
-- lib/co/node/list.rb
-- lib/co/util.rb
 - lib/ro.rb
 - lib/ro/blankslate.rb
 - lib/ro/cache.rb
+- lib/ro/git.rb
 - lib/ro/initializers/env.rb
 - lib/ro/initializers/tilt.rb
+- lib/ro/lock.rb
+- lib/ro/model.rb
 - lib/ro/node.rb
 - lib/ro/node/list.rb
 - lib/ro/root.rb
@@ -122,15 +162,6 @@ files:
 - lib/ro/template.rb
 - notes/ara.txt
 - ro.gemspec
-- ro/people/ara/assets/ara-glacier.jpg
-- ro/people/ara/assets/source/a.rb
-- ro/people/ara/attributes.yml
-- ro/people/ara/bio.md.erb
-- ro/people/noah/attributes.yml
-- ro/posts/hello-world/attributes.yml
-- ro/posts/hello-world/body.md
-- ro/posts/second-awesome-post/attributes.yml
-- ro/posts/second-awesome-post/body.md
 homepage: https://github.com/ahoward/ro
 licenses:
 - Same As Ruby's

data/:

@@ -1,9 +0,0 @@
-module Ro
-  class Template
-    fattr :path
-
-    def initialize(path)
-      @path = Ro.realpath(path)
-    end
-  end
-end

data/:w

@@ -1,29 +0,0 @@
-module Ro
-  class Db
-    fattr :root
-
-    def initialize(*args, &block)
-      options = Map.options_for!(args)
-
-      @root = String(args.shift || options[:root] || Ro.root)
-    end
-
-    def collections
-    end
-
-    def glob
-    end
-
-    def nodes
-      42
-    end
-
-    class Collection
-      fattr :basename
-
-      def initialize(basename)
-        @basename = basename.to_s
-      end
-    end
-  end
-end