picatrix 0.2.0 → 0.5.0

data/lib/picatrix/pacman.rb

@@ -1,19 +1,22 @@
 module Picatrix
   # eats dots :)
+  # and gives you back nodes and edges
   class Pacman
-    attr_accessor :graph, :hash
+    attr_accessor :hash
+    attr_accessor :nodes, :edges
 
     def initialize(file_name)
-      @graph = GraphViz.parse(
-        file_name, :path => "/usr/local/bin"
-      )
       @hash = TransformToHash.new.apply(
-        DigraphParser.new.parse_with_debug(
+        DigraphParser.new.parse(
           File.read(file_name)
         )
       ).flat_map(&:entries).
       group_by(&:first).
       map {|k,v| Hash[k, v.map(&:last)]}
+
+      grouped = @hash.group_by {|e| e.keys.first}
+      @nodes = grouped[:node].flat_map {|e| e[:node]}.reduce({}, :merge)
+      @edges = grouped[:edge].flat_map {|e| e[:edge]}
     end
   end
 end

data/lib/picatrix/routes.rb

@@ -0,0 +1,40 @@
+module Picatrix
+  # this class is the data structure you'll construct the Sinatra
+  # routes and their corresponding handling method bodies
+  class Routes
+    attr_accessor :unique_routes, :root_path
+
+    def initialize(edges, control_templates)
+      @unique_routes = edges.collect do |edge|
+        source = edge.keys.first
+        target = edge.values.first[:target]
+        properties = edge[source]
+
+        link_relation = properties[:link_relation].delete('"')
+
+        if source == "root"
+          #TODO right now app is using this in place of
+          # figuring out parent collections of collections
+          @root_path = target
+        end
+
+        templates = {}
+        if (control = control_templates[target])
+          templates.merge!(control.to_hash)
+        end
+
+        {
+          path: target,
+          link_relation: link_relation,
+          method: properties[:method],
+          resource: {
+            name: target.camelcase.constantize,
+            collection: (target == target.pluralize)
+          },
+          control_templates: templates
+        }
+        # make sure routes are not duplicated
+      end.compact.uniq {|e| [e[:path], e[:method]]}
+    end
+  end
+end

data/lib/picatrix/templates/app.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require 'sinatra/json'
+require 'protobuf'
 require 'require_all'
 
 require_all("./lib/picatrix/generated/*.rb")
@@ -12,37 +13,152 @@ class <%= @app_name.camelize %> < Sinatra::Base
   end
 
   get '/' do
-    status, headers, body = call env.merge("PATH_INFO" => "/<%= @root_path %>")
+    status, headers, body = call env.merge("PATH_INFO" => "/<%= @routes.root_path %>")
     [status, headers, body]
   end
 
-<% @routes.uniq.each do |route| %>
- <% if return_mapping_of(route[:method]) == :collection_return %>
+  def json(hash = {})
+    # anything set here will be sent in all responses
+    super(<%= @namespaces %>.merge!(hash))
+  end
+
+<% @routes.unique_routes.each do |route| %>
+<% if route[:resource][:collection] %>
    <%= route[:method] %> "/<%= route[:path] %>" do
-     # get collection
-     items = <%= route[:collection][:resource_name].constantize %>.all
-     # render collection into templates
-     hashed_items = items.collect do |item|
-       <%= route[:collection][:template].to_s.delete("\\") %>
+     items = <%= route[:resource][:name] %>Resource.all.collection.collect do |r|
+       r.to_hash
      end
-     # return that collection
-     json(<%= route[:body] %>.merge({"<%= route[:collection][:name] %>" => hashed_items}))
+
+     <% if route[:control_templates][route[:path]][route[:method]] %>
+     controls = send(:<%= route[:control_templates][route[:path]][route[:method]] %>, <%= route[:resource][:name] %>).call("<%= route[:path] %>", params)
+     <% else %>
+     controls = {}
+     <% end %>
+
+     json(
+       {:@controls => controls}.
+        merge!({"<%= route[:resource][:name].to_s.underscore %>" => items})
+     )
    end
   <% else %>
-   <%= route[:method] %> "/<%= route[:path] %>" do
-     # create item
-     item = <%= route[:collection][:resource_name].constantize %>.<%= send_method_for(route[:method]).to_s %>(params)
-     # return new item
-     json(<%= route[:body] %>)
+   <%= route[:method] %> "/<%= route[:path] %>/:item_id" do
+     item = <%= route[:resource][:name].to_s.pluralize.constantize %>Resource.<%= send_method_for(route[:method]).to_s %>(params[:item_id])
+
+     <% if route[:control_templates][route[:path]][route[:method]] %>
+     controls = send(:<%= route[:control_templates][route[:path]][route[:method]] %>, <%= route[:resource][:name] %>).call("<%= route[:path] %>", params)
+     <% else %>
+     controls = {}
+     <% end %>
+
+     json(
+       {:@controls => controls}.
+        merge!(item.to_hash.except(:controls))
+     )
    end
   <% end %>
 <% end %>
 
-<% @addressable_items.each do |item| %>
-   get "/<%= item[:path] %>" do
-     item_id = params[:item_id]
-     item = <%= item[:type].camelcase.constantize %>.find(item_id)
-     json(<%= item[:body] %>)
-   end
-<% end %>
+  def mason_up(type)
+    if type == collection
+      proc do |path, params|
+        {
+          up: Mason::Up.new(
+            {
+              href: "http://localhost:9292/#{<%= @root_path %>}"
+            }
+          ).to_hash
+        }
+      end
+    else
+      proc do |path, params|
+        {
+          up: Mason::Up.new(
+            {
+              href: "http://localhost:9292/#{path}"
+            }
+          ).to_hash
+        }
+      end
+    end
+  end
+  def mason_self(item)
+      proc do |path, params|
+        if params[:item_id]
+          {
+            self: Mason::Self.new(
+              {
+                href: "http://localhost:9292/#{path}/#{params[:item_id]}"
+              }
+            ).to_hash
+          }
+        else
+          {
+            self: Mason::Self.new(
+              {
+                href: "http://localhost:9292/#{path}"
+              }
+            ).to_hash
+          }
+        end
+      end
+  end
+  def edit(item)
+      proc do |path, params|
+        {
+          edit: ("Edit" + item.to_s.singularize.camelize).constantize.new(
+            {
+              form: Mason::Edit.new(
+                href: "http://localhost:9292/#{path}/#{params[:item_id]}"
+              )
+            }
+          ).to_hash
+        }
+      end
+  end
+  def remove(item)
+      proc do |path, params|
+        {
+          remove: Mason::Remove.new(
+            {
+              href: "http://localhost:9292/#{path}/#{params[:item_id]}"
+            }
+          ).to_hash
+        }
+      end
+  end
+  def create(item)
+      proc do |path, params|
+        {
+          create: ("Create" + item.to_s.singularize.camelize).constantize.new(
+            {
+              form: Mason::Create.new(
+                href: ""
+              )
+            }
+          )
+        }
+      end
+  end
+  def filter(collection)
+    # TODO this prob cant really work here
+      proc do |path, params|
+        if params[:item_id]
+          {
+            "<%= @prefix %>filter": Mason::Filter.new(
+              {
+                href: "http://localhost:9292/#{path}/#{params[:item_id]}"
+              }
+            ).to_hash
+          }
+        else
+          {
+            "<%= @prefix %>filter": Mason::Filter.new(
+              {
+                href: "http://localhost:9292/#{path}"
+              }
+            ).to_hash
+          }
+      end
+    end
+  end
 end

data/lib/picatrix/templates/control.rb

@@ -0,0 +1,15 @@
+require 'ostruct'
+class <%= @node_name.camelize %>
+  def self.attributes
+    {
+      namespace: "s",
+      action_name: "filter",
+      href: "http://localhost:9292/view_submissions/filter?category={category}&has_photo={has_photo}",
+      method: "",
+      template: {},
+      isHrefTemplate: false,
+      title: "filter submissions by category",
+      description: "in addition to category, you can ensure the submission has a photo"
+    }
+  end
+end

data/lib/picatrix/templates/type.rb

@@ -1,27 +1,41 @@
-require 'ostruct'
-class <%= @node_name.camelize %>
-  def self.find(item_id)
-    OpenStruct.new(
-      category: "cats",
-      photo: "http://imgur.com/r/cats/myEqIZx",
-      id: item_id
+# you can remove this if you don't use faker
+# for your fixture data
+require 'faker'
+
+# the resource is the thing actually persisted
+# technically, this is just an interface to it
+# so long as your persistance layer is able to implement
+# the methods in this fixture, the app will generate
+class <%= @resource_name %>Resource
+  # method used to return single item from a collection
+  # creates an instance on the fly
+  # both the find and collection methods use this
+  def self.create(item_id)
+    <%= @resource_name.singularize %>.new(
+      {
+        # any "bare" Proto type will be given an associated Faker
+        <% @fields.keys.each do |field_key| %>
+        :<%= field_key %> => <%= @fields[field_key] %>,
+        <% end %>
+      }
     )
   end
-  def self.create(params)
-    self.find(rand(10))
+  def self.find(params)
+    self.create(params)
   end
   def self.all
-    [
-      OpenStruct.new(
-        category: "cats",
-        photo: "http://imgur.com/r/cats/myEqIZx",
-        id: 1
-      ),
-      OpenStruct.new(
-        category: "cats",
-        photo: "http://imgur.com/r/cats/myEqIZx",
-        id: 2
-      )
-    ]
+    collection = []
+    rand(10).times {
+      collection << self.find(rand(1000))
+    }
+    <%= @resource_name %>.new(collection: collection)
+  end
+
+  def self.minimal_controls_for(item_id)
+    host = "http://localhost:9292"
+    {
+      self: Mason::Self.new(href: "#{host}/<%= @resource_name.singularize.underscore %>/#{item_id}"),
+      up: Mason::Up.new(href: "#{host}/<%= @resource_name.underscore %>")
+    }
   end
 end

data/lib/picatrix/transform_to_hash.rb

@@ -1,19 +1,10 @@
 module Picatrix
   class TransformToHash < Parslet::Transform
     rule(:node => subtree(:node)) do
-      types = {
-        note: "template",
-        folder: "collection",
-        rectangle: "item"
-      }
-      shape = String(node[:shape]).split("=").last.to_sym
-      type_of_node_from_shape = types[shape]
-
       {
         node: {
           String(node[:name]) => {
             label: String(node[:label]),
-            type: type_of_node_from_shape
           }
         }
       }
@@ -36,7 +27,6 @@ module Picatrix
           String(edge[:outbound]) => {
             target: String(edge[:inbound]).delete(" {} "),
             link_relation: String(edge[:link_relation]),
-            inline: String(edge[:style]).include?("dotted"),
             method: method
           }
         }

data/lib/picatrix/version.rb

@@ -1,3 +1,3 @@
 module Picatrix
-  VERSION = "0.2.0"
+  VERSION = "0.5.0"
 end

data/lib/picatrix.rb

@@ -1,4 +1,5 @@
 require "picatrix/version"
+require "protobuf"
 require "parslet"
 require "graphviz"
 require "active_support"
@@ -8,6 +9,10 @@ require "thor"
 require "picatrix/pacman"
 require "picatrix/digraph_parser"
 require "picatrix/transform_to_hash"
+require "picatrix/link_relation_index"
+require "picatrix/routes"
+require "picatrix/cruddy"
+require "picatrix/buffy"
 require "picatrix/jenny"
 
 module Picatrix
@@ -20,9 +25,25 @@ module Picatrix
       puts "output: #{output}" if output
 
       Jenny.new(
-        Pacman.new(dot_file_name).hash,
+        Pacman.new(
+          dot_file_name
+        ).hash,
         options
       ).just_do_it
     end
+
+    desc "prep <dot file name>", "outputs an image and sets up fixtures necessary to generate your app"
+    def prep(dot_file_name)
+      GraphViz.parse(dot_file_name, :path => "/usr/local/bin").
+        output(:png => "#{dot_file_name}.png")
+      puts "output to #{dot_file_name}.png"
+
+      Buffy.new(
+        Pacman.new(
+          dot_file_name
+        ).nodes
+      )
+      puts "output to generated/"
+    end
   end
 end

data/picatrix.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "parslet"
+  spec.add_dependency "protobuf"
+  spec.add_dependency "faker"
   spec.add_dependency "ruby-graphviz"
   spec.add_dependency "thor"
   spec.add_dependency "activesupport"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picatrix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alex Moore-Niemi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: protobuf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
@@ -224,18 +252,24 @@ files:
 - bin/console
 - bin/picapica
 - bin/setup
+- definitions/app.proto
+- definitions/mason.proto
 - lib/picatrix.rb
+- lib/picatrix/buffy.rb
+- lib/picatrix/cruddy.rb
 - lib/picatrix/digraph_parser.rb
+- lib/picatrix/fixtures/view_submission.rb
+- lib/picatrix/generated/app.pb.rb
 - lib/picatrix/generated/app.rb
-- lib/picatrix/generated/view_submission.rb
+- lib/picatrix/generated/mason.pb.rb
+- lib/picatrix/generated/mason/namespaces.json
+- lib/picatrix/generated/view_submissions.rb
 - lib/picatrix/jenny.rb
+- lib/picatrix/link_relation_index.rb
 - lib/picatrix/pacman.rb
-- lib/picatrix/schemas/view_submission_item.json
+- lib/picatrix/routes.rb
 - lib/picatrix/templates/app.rb
-- lib/picatrix/templates/mason/submission_filter_template.json
-- lib/picatrix/templates/mason/view_submission.json
-- lib/picatrix/templates/mason/view_submission_min.json
-- lib/picatrix/templates/mason/view_submissions.json
+- lib/picatrix/templates/control.rb
 - lib/picatrix/templates/type.rb
 - lib/picatrix/transform_to_hash.rb
 - lib/picatrix/version.rb
@@ -265,4 +299,3 @@ signing_key:
 specification_version: 4
 summary: 'input: dot file + yml files, output: ruby api'
 test_files: []
-has_rdoc: 

data/lib/picatrix/generated/view_submission.rb

@@ -1,27 +0,0 @@
-require 'ostruct'
-class ViewSubmission
-  def self.find(item_id)
-    OpenStruct.new(
-      category: "cats",
-      photo: "http://imgur.com/r/cats/myEqIZx",
-      id: item_id
-    )
-  end
-  def self.create(params)
-    self.find(rand(10))
-  end
-  def self.all
-    [
-      OpenStruct.new(
-        category: "cats",
-        photo: "http://imgur.com/r/cats/myEqIZx",
-        id: 1
-      ),
-      OpenStruct.new(
-        category: "cats",
-        photo: "http://imgur.com/r/cats/myEqIZx",
-        id: 2
-      )
-    ]
-  end
-end

data/lib/picatrix/schemas/view_submission_item.json

@@ -1,12 +0,0 @@
-{
-  "title": "Schema",
-  "type": "object",
-  "properties": {
-    "category": {
-      "type": "string"
-    },
-    "photo": {
-      "type": "string"
-    }
-  }
-}

data/lib/picatrix/templates/mason/submission_filter_template.json

@@ -1,4 +0,0 @@
-{
-  "category": "#{params[:category]}",
-  "has_photo": "#{params[:has_photo]}"
-}

data/lib/picatrix/templates/mason/view_submission.json

@@ -1,35 +0,0 @@
-{
-  "@namespaces": {
-    "s": {
-      "name": "http://localhost:9292/rels#"
-    }
-  },
-  "@controls": {
-    "self": {
-      "title": "submission #{item.id}",
-      "href": "http://localhost:9292/view_submission/#{item.id}"
-    },
-    "up": {
-      "title": "View submissions",
-      "href": "http://localhost:9292/view_submissions/newest"
-    },
-    "s:edit": {
-      "title": "update category or photo url",
-      "encoding": "json",
-      "href": "http://localhost:9292/view_submission/#{item.id}",
-      "method": "PATCH",
-      "template": {
-        "photo": "{new_url}",
-        "category": "{new_category}"
-      }
-    },
-    "s:remove": {
-      "title": "remove submission",
-      "href": "http://localhost:9292/view_submission/#{item.id}",
-      "method": "DELETE"
-    }
-  },
-  "id": "#{item.id}",
-  "category": "#{item.category}",
-  "photo": "#{item.photo}"
-}

data/lib/picatrix/templates/mason/view_submission_min.json

@@ -1,11 +0,0 @@
-{
-  "@controls": {
-    "self": {
-      "title": "submission #{item.id}",
-      "href": "http://localhost:9292/view_submission/#{item.id}"
-    }
-  },
-  "id": "#{item.id}",
-  "category": "#{item.category}",
-  "photo": "#{item.photo}"
-}

data/lib/picatrix/templates/mason/view_submissions.json

@@ -1,36 +0,0 @@
-{
-  "title": "View submissions",
-  "description": "idk yet",
-  "@meta": {
-    "@title": "Submissions",
-    "@description": "This resource represents submissions."
-  },
-  "@namespaces": {
-    "s": {
-      "name": "http://localhost:9292/rels#"
-    }
-  },
-  "@controls": {
-    "self": {
-      "href": "http://localhost:9292/view_submissions/newest"
-    },
-    "s:filter": {
-      "href": "http://localhost:9292/view_submissions/filter?category={category}&has_photo={has_photo}",
-      "isHrefTemplate": true,
-      "title": "filter submissions by category",
-      "description": "in addition to category, you can ensure the submission has a photo"
-    },
-    "s:add": {
-      "title": "add new submission",
-      "encoding": "json",
-      "href": "http://localhost:9292/submission_add_template/submit",
-      "method": "POST",
-      "template":
-      {
-        "title": "default title",
-        "category": "cats",
-        "photo_url": "http://cats.com"
-      }
-    }
-  }
-}