orange-sparkles 0.7.0 → 0.7.1

data/examples/simple/cartons/bar.rb

@@ -0,0 +1,14 @@
+class Bar < Orange::Carton
+  id
+  front do
+    text :foo
+    text :bar
+    markdown :banana
+  end
+  admin do
+    
+    text :baz
+    fulltext :qux
+  end
+  as_sparkles_resource
+end

data/lib/orange-sparkles/plugin.rb

@@ -1,10 +1,11 @@
+require 'orange-sparkles/sparkles_app_resource'
 require 'orange-sparkles/sparkles_resource'
 module Orange::Plugins
   class Sparkles < Base
     assets_dir      File.join(File.dirname(__FILE__), 'assets')
     views_dir       File.join(File.dirname(__FILE__), 'views')
     templates_dir   File.join(File.dirname(__FILE__), 'templates')
-    resource SparklesResource.new
+    resource SparklesAppResource.new
   end
 end
 

data/lib/orange-sparkles/sparkles_app_resource.rb

@@ -0,0 +1,72 @@
+require 'extlib/mash'
+
+class Orange::Carton
+  # Define a helper for input type="text" type database stuff
+  # Show in a context if wrapped in one of the helpers
+  def self.markdown(name, opts = {})
+    add_scaffold(name, :markdown, DataMapper::Property::Text, opts.with_defaults(:lazy => true))
+  end
+  
+  # Declares a SparklesResource subclass that scaffolds this carton
+  # The Subclass will have the name of the carton followed by "Resource"
+  def self.as_sparkles_resource
+    name = self.to_s
+    eval <<-HEREDOC
+    class ::#{name}Resource < Orange::SparklesResource
+      use #{name}
+      call_me :#{name.downcase}
+    end
+    HEREDOC
+  end
+  def self.as_sparkle_resource
+    as_sparkles_resource
+  end
+end
+
+class SparklesAppResource < Orange::Resource
+  call_me :sparkles
+  
+  def init
+    @tabs = []
+  end
+  def stack_init
+    orange[:scaffold].add_scaffold_type(:markdown) do |name, val, opts|
+      packet = opts[:packet]
+      opts = opts.with_defaults({:value => '', :label => false, :show => false, :wrap_tag => 'div'})
+      if opts[:show]
+        packet.markdown(val || '')
+      else
+        val = '' if val.blank?
+        val.gsub!("\n", '&#010;')
+        ret = "<textarea name='#{opts[:model_name]}[#{name}]' class='markdown-editor'>#{val}</textarea>"
+        ret = "<label for=''>#{opts[:display_name]}</label><br />" + ret if opts[:label]
+        ret = "<#{opts[:wrap_tag]}>#{ret}</#{opts[:wrap_tag]}>" if opts[:wrap_tag]
+        ret
+      end
+    end
+  end
+  
+  def stylesheets
+    orange.options["sparkles.stylesheets"] || []
+  end
+  def javascripts
+    orange.options["sparkles.javascripts"] || []
+  end
+  def site_name(packet, default = "An Orange Site")
+    packet['site'] ? packet['site'].name : default
+  end
+  def sidebar?
+    orange.options["sidebar_on"] || false
+  end
+  def add_tab(resource, text = nil)
+    @tabs << {:resource => resource, :text => (text || resource.to_s.capitalize)}
+  end
+  def tabs
+    tabs = orange.options["sparkles.tabs"] || []
+    tabs = (tabs + @tabs) unless @tabs.blank?
+    tabs.collect{|hash| Mash.new(hash)} || []
+  end
+  def default_style?
+    orange.options["sparkles.default_style"] || stylesheets.empty?
+  end
+end

data/lib/orange-sparkles/sparkles_resource.rb

@@ -1,23 +1,55 @@
-require 'extlib/mash'
-class SparklesResource < Orange::Resource
-  call_me :sparkles
-  def stylesheets
-    orange.options["sparkles.stylesheets"] || []
+class Orange::SparklesResource < Orange::ModelResource
+  extend ClassInheritableAttributes
+  cattr_accessor :tabbed, :auto_sitemap
+  viewable :summary
+  
+  def self.tab(text = nil)
+    self.tabbed = text
   end
-  def javascripts
-    orange.options["sparkles.javascripts"] || []
+  
+  def self.auto_sitemap!
+    self.auto_sitemap = true
   end
-  def site_name(packet, default = "An Orange Site")
-    packet['site'] ? packet['site'].name : default
+  
+  def exposed?(packet)
+    []
   end
-  def sidebar?
-    orange.options["sidebar_on"] || false
+  
+  def stack_init
+    orange[:sparkles].add_tab(@my_orange_name, self.class.tabbed) if self.class.tabbed || (self.class.tabbed == nil)    
+    orange.register(:sitemap_created) do |opts|
+      packet = opts[:packet]
+      site_id = opts[:site_id]
+      orange[:sitemap, true].add_route_for(packet,
+        :orange_site_id => site_id, 
+        :resource => @my_orange_name, 
+        :resource_action => :do_route,
+        :slug => @my_orange_name.to_s, 
+        :link_text => @my_orange_name.to_s.capitalize,
+        :show_in_nav => true
+        )
+    end if (self.class.auto_sitemap || (self.class.auto_sitemap == nil)) 
   end
-  def tabs
-    tabs = orange.options["sparkles.tabs"] || []
-    tabs.collect{|hash| Mash.new(hash)} || []
+  
+  def route_with_resource(packet, *args)
+    route = orange[:sitemap, true].url_for(packet,
+      :resource => @my_orange_name, 
+      :resource_action => :do_route
+      )
+    route + args.compact.join('/')
   end
-  def default_style?
-    orange.options["sparkles.default_style"] || stylesheets.empty?
+  
+  def do_route(packet, opts = {})
+    resource_path = packet['route.resource_path']
+    parts = resource_path.split('/')
+    route(packet, parts, opts = {})
+  end
+  
+  def route(packet, route_parts, opts = {})
+    if route_parts.blank?
+      list(packet, opts)
+    else
+      show(packet, opts.with_defaults({:resource_id => route_parts.first}))
+    end
   end
 end

data/lib/orange-sparkles/templates/sparkles-admin.haml

@@ -9,6 +9,8 @@
     = part[:js]
     %link{:rel => "stylesheet", :type => "text/css", :href => "/assets/_sparkles_/js/markitup/skins/simple/style.css"}
     %link{:rel => "stylesheet", :type => "text/css", :href => "/assets/_sparkles_/js/markitup/sets/markdown/style.css"}
+    :javascript
+      $(function(){$('.markdown-editor').markItUp(mySettings);})
   %body{:id => packet["route.resource"].to_s}
     %div#header
       %div#user-status 
@@ -25,10 +27,10 @@
       %div.tab-container
         / %a.tab#home-tab{:href => "#"} Home
         %a.tab#sitemap-tab{:href => route_to(:sitemap)} Pages
-        %a.tab#assets-tab{:href => route_to(:assets)} Assets
         - for link in (orange[:sparkles].tabs || [])
           %style= "body##{link[:resource]} a##{link[:resource]}-tab{ background: #999999;}"
           %a.tab{:id => "#{link[:resource]}-tab", :href => route_to(link[:resource])}= link[:text]
+        %a.tab#assets-tab{:href => route_to(:assets)} Assets
     %div#subheader
       %h1
         %img.subhead-icon{:src => "/assets/_sparkles_/images/edit.png", :width => "23", :height => "22", :alt => "Pages icon"}

data/lib/orange-sparkles/views/blog_posts/create.haml

@@ -4,9 +4,8 @@
 %div#edit-box
   %form#edit{:action => route_to(model_name, "new"), :method => "post", :"accept-charset" => "UTF-8"}
     %label{:for => "edit-title"} Title
-    %input#publish-social{:type => "hidden", :name => "#{model_name}[publish_to_social]", :value => "0"}
     %input#edit-title{:type => "text", :name => "#{model_name}[title]", :value => ""}
-    %textarea#edit-content{:cols => "32", :rows => "40", :name => "#{model_name}[body]"}<= ''
+    %textarea#edit-content{:cols => "32", :rows => "20", :name => "#{model_name}[body]"}<= ''
     %div#save-status
       New Draft
     %input#publish-me{:type => "hidden", :name => "#{model_name}[published]", :value => "0"}
@@ -43,13 +42,13 @@
         /             %a.grey-button Add to Menu
         /           %hr.one-px-grey
         
-        %div#publish_to_social.control-label
-          Publish to Social Media?
-          %div.slider-container
-            %div.slider-background.slider-background-yes-no
-              %div.slider-off
-                No
-          %hr.one-px-grey
+        / %div#publish_to_social.control-label
+        /           Publish to Social Media?
+        /           %div.slider-container
+        /             %div.slider-background.slider-background-yes-no
+        /               %div.slider-off
+        /                 No
+        /           %hr.one-px-grey
         %div#page-summary.control-label
           Page Summary (optional)
           %div.settings-collapse

data/lib/orange-sparkles/views/blog_posts/edit.haml

@@ -6,7 +6,7 @@
     %label{:for => "edit-title"} Title
     - # Make it harder to republish to social by forcing publish to social off.
     %input#edit-title{:type => "text", :name => "#{model_name}[title]", :value => model.title}
-    %textarea#edit-content{:cols => "32", :rows => "40", :name => "#{model_name}[body]"}<= model.body
+    %textarea#edit-content{:cols => "32", :rows => "20", :name => "#{model_name}[body]"}<= model.body
     %div#save-status
       #{model.published ? "Published" : "Draft saved"} #{fuzzy_time(model.updated_at)}
     %input#publish-me{:type => "hidden", :name => "#{model_name}[published]", :value => "0"}  
@@ -48,17 +48,17 @@
         /             %a.grey-button Add to Menu
         /           %hr.one-px-grey
         
-        %div#publish_to_social.control-label
-          Publish To Social Media?
-          %div.slider-container
-            %div.slider-background.slider-background-yes-no
-              - if model.publish_to_social && !model.published
-                %div.slider
-                  Yes
-              - else
-                %div.slider-off
-                  No
-          %hr.one-px-grey
+        / %div#publish_to_social.control-label
+        /           Publish To Social Media?
+        /           %div.slider-container
+        /             %div.slider-background.slider-background-yes-no
+        /               - if model.publish_to_social && !model.published
+        /                 %div.slider
+        /                   Yes
+        /               - else
+        /                 %div.slider-off
+        /                   No
+        /           %hr.one-px-grey
         %div#page-summary.control-label
           Page Summary (optional)
           %div.settings-collapse

data/lib/orange-sparkles/views/default_resource/admin.list.haml

@@ -0,0 +1,31 @@
+- packet.add_js("page-list-effects.js", :module => "_sparkles_")
+- is_short ||= false
+.list-view
+  %table.tablesorter{:class => (is_short ? "is_short" : "")}
+    %thead
+      %tr.list-header-group
+        %th.list-header.page-listing-expand-collapse  
+        - for prop in props
+          %th.list-header= prop[:name].to_s.gsub('_', ' ').capitalize
+        %td.list-header Actions
+    %tfoot
+      %tr
+        %td  
+        - for prop in props
+          %td  
+        %td
+          %a.button.add-button{:href => route_to(model_name, 'create')} New
+    %tbody
+      - for obj in list
+        %tr.page-listing-item= view_table_row(model_name, :model => obj)
+  .pager
+    %form
+      %img.first{:src=>"/assets/_sparkles_/images/tablesorter/first.png"}
+      %img.prev{:src=>"/assets/_sparkles_/images/tablesorter/prev.png"}
+      %input.pagedisplay{:type => "text"}
+      %img.next{:src=>"/assets/_sparkles_/images/tablesorter/next.png"}
+      %img.last{:src=>"/assets/_sparkles_/images/tablesorter/last.png"}
+      %select.pagesize
+        %option{:value => "5", :selected => is_short ? true : false} 5
+        %option{:value => "10", :selected => is_short ? false : true} 10
+        %option{:value => "25"} 25

data/lib/orange-sparkles/views/default_resource/create.haml

@@ -2,5 +2,5 @@
   %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :"accept-charset" => "UTF-8"}
     - packet["page.title"] = "#{model_name.to_s.capitalize} > Create"
     - for prop in props
-      %p= view_attribute(prop, model_name, :label => true)
+      !~ view_attribute(prop, model_name, :label => true)
     %input{:type => 'submit', :value => 'Save New Item'}

data/lib/orange-sparkles/views/default_resource/edit.haml

@@ -5,7 +5,10 @@
       = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
     %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
       - for prop in props
-        %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
+        - if(prop[:relationship])
+          !~ view_attribute(prop, model_name, :label => true, :value => model.__send__(prop[:name]), :model => model)
+        - else
+          !~ view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
       %input{:type => 'submit', :value => 'Save Changes'}
   - else
     %p Couldn't find the item you're looking for.

data/lib/orange-sparkles/views/default_resource/list.haml

@@ -1,31 +1,2 @@
-- packet.add_js("page-list-effects.js", :module => "_sparkles_")
-- is_short ||= false
-.list-view
-  %table.tablesorter{:class => (is_short ? "is_short" : "")}
-    %thead
-      %tr.list-header-group
-        %th.list-header.page-listing-expand-collapse  
-        - for prop in props
-          %th.list-header= prop[:name].to_s.gsub('_', ' ').capitalize
-        %td.list-header Actions
-    %tfoot
-      %tr
-        %td  
-        - for prop in props
-          %td  
-        %td
-          %a.button.add-button{:href => route_to(model_name, 'create')} New
-    %tbody
-      - for obj in list
-        %tr.page-listing-item= view_table_row(model_name, :model => obj)
-  .pager
-    %form
-      %img.first{:src=>"/assets/_sparkles_/images/tablesorter/first.png"}
-      %img.prev{:src=>"/assets/_sparkles_/images/tablesorter/prev.png"}
-      %input.pagedisplay{:type => "text"}
-      %img.next{:src=>"/assets/_sparkles_/images/tablesorter/next.png"}
-      %img.last{:src=>"/assets/_sparkles_/images/tablesorter/last.png"}
-      %select.pagesize
-        %option{:value => "5", :selected => is_short ? true : false} 5
-        %option{:value => "10", :selected => is_short ? false : true} 10
-        %option{:value => "25"} 25
+- for obj in list
+  = view_summary(model_name, :model => obj)

data/lib/orange-sparkles/views/default_resource/orange.list.haml

@@ -0,0 +1,31 @@
+- packet.add_js("page-list-effects.js", :module => "_sparkles_")
+- is_short ||= false
+.list-view
+  %table.tablesorter{:class => (is_short ? "is_short" : "")}
+    %thead
+      %tr.list-header-group
+        %th.list-header.page-listing-expand-collapse  
+        - for prop in props
+          %th.list-header= prop[:name].to_s.gsub('_', ' ').capitalize
+        %td.list-header Actions
+    %tfoot
+      %tr
+        %td  
+        - for prop in props
+          %td  
+        %td
+          %a.button.add-button{:href => route_to(model_name, 'create')} New
+    %tbody
+      - for obj in list
+        %tr.page-listing-item= view_table_row(model_name, :model => obj)
+  .pager
+    %form
+      %img.first{:src=>"/assets/_sparkles_/images/tablesorter/first.png"}
+      %img.prev{:src=>"/assets/_sparkles_/images/tablesorter/prev.png"}
+      %input.pagedisplay{:type => "text"}
+      %img.next{:src=>"/assets/_sparkles_/images/tablesorter/next.png"}
+      %img.last{:src=>"/assets/_sparkles_/images/tablesorter/last.png"}
+      %select.pagesize
+        %option{:value => "5", :selected => is_short ? true : false} 5
+        %option{:value => "10", :selected => is_short ? false : true} 10
+        %option{:value => "25"} 25

data/lib/orange-sparkles/views/default_resource/show.haml

@@ -1,4 +1,7 @@
 - if model
   %div{ :class => model_name}
     - for prop in props
-      = view_attribute(prop, model_name, :show => true, :value => model.attribute_get(prop[:name]), :model => model)
+      - if(prop[:relationship])
+        !~ view_attribute(prop, model_name, :show => true, :value => model.__send__(prop[:name]), :model => model)
+      - else
+        !~ view_attribute(prop, model_name, :show => true, :value => model.attribute_get(prop[:name]), :model => model)

data/lib/orange-sparkles/views/default_resource/summary.haml

@@ -0,0 +1 @@
+= view_show(model_name, :model => model)

data/lib/orange-sparkles/views/default_resource/table_row.haml

@@ -2,7 +2,10 @@
   %td.move
      
   - for prop in props
-    %td= model.attribute_get(prop[:name])
+    - if(prop[:relationship])
+      %td= [:belongs, :has_one].include?(prop[:type]) ? (model.__send__(prop[:name]) ? model.__send__(prop[:name]).scaffold_name : "") : ""
+    - else
+      %td= model.attribute_get(prop[:name])
   %td.actions
     %div.page-listing-actions
       %a.button.grey-button.preview-button{:href => route_to(model_name, model.id, "edit")}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -265,6 +265,7 @@ files:
 - lib/orange-sparkles/assets/js/popout-effects-page-edit.js
 - lib/orange-sparkles/plugin.rb
 - lib/orange-sparkles/sparkles_app.rb
+- lib/orange-sparkles/sparkles_app_resource.rb
 - lib/orange-sparkles/sparkles_resource.rb
 - lib/orange-sparkles/templates/home.haml
 - lib/orange-sparkles/templates/sparkles-admin.haml
@@ -287,11 +288,14 @@ files:
 - lib/orange-sparkles/views/blog_posts/table_row.haml
 - lib/orange-sparkles/views/contactforms/contactform.haml
 - lib/orange-sparkles/views/contactforms/list.haml
+- lib/orange-sparkles/views/default_resource/admin.list.haml
 - lib/orange-sparkles/views/default_resource/create.haml
 - lib/orange-sparkles/views/default_resource/edit.haml
 - lib/orange-sparkles/views/default_resource/list.haml
+- lib/orange-sparkles/views/default_resource/orange.list.haml
 - lib/orange-sparkles/views/default_resource/show.haml
 - lib/orange-sparkles/views/default_resource/sitemap_row.haml
+- lib/orange-sparkles/views/default_resource/summary.haml
 - lib/orange-sparkles/views/default_resource/table_row.haml
 - lib/orange-sparkles/views/disqus/comment_thread.haml
 - lib/orange-sparkles/views/news/archive.haml
@@ -358,5 +362,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Adding some prettiness to orange-core
-test_files: []
-
+test_files: 
+- examples/simple/cartons/bar.rb