pixelearth 0.0.3 → 0.0.4

data/lib/pixelearth/version.rb

@@ -1,3 +1,3 @@
 module Pixelearth
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/pixelearth.rb

@@ -4,6 +4,8 @@ require 'rails'
 require 'haml-rails'
 require 'redcloth'
 require 'formtastic'
+require 'redgreen'
+require 'colored'  
 
 
 

data/lib/required/application_controller.rb

@@ -88,120 +88,15 @@ module ActionController
         when 'create'
           title_h1 "New #{params[:controller].singularize.titleize} (with errors)"
         when 'show'
-          title_h1 "#{params[:controller].singularize.titleize}: #{@resource.name.titleize || @resource.id }"
+          title_h1 "#{params[:controller].singularize.titleize}: #{begin @resource.name.titleize rescue @resource.id end }"
         when 'edit'
-          title_h1 "Editing #{params[:controller].singularize.titleize}: #{@resource.name.titleize || @resource.id }"
+          title_h1 "Editing #{params[:controller].singularize.titleize}: #{begin @resource.name.titleize rescue @resource.id end}"
         when 'update'
           title_h1 "Editing #{params[:controller].singularize.titleize} (with errors)"
         when 'index'
           title_h1 "Listing #{params[:controller].titleize}"
         else
-          "{Default Title}"
-        end
-      end
-  end
-
-
-  class ApplicationController < ActionController::Base
-
-    helper_method :h1,
-                  :strip_tags, 
-                  :tweet,
-                  :title,
-                  :title_h1,
-                  :default_view_title
-
-
-    @layout  = {}
-
-
-    # -----------  CONTROLLER --------------
-                                                                                          #gets @resource or @resource for all actions in controller
-                                                                                          #before filter is set per controller, thus overrideable. 
-    def get_resource                                                                      
-      puts '-----'+params[:controller]
-      action     = params[:action].to_sym
-      controller = params[:controller]
-      klass      = controller.classify.constantize 
-
-      if [:show, :edit, :update, :destroy].include? action
-        @resource = klass.find(params[:id])
-      elsif action == :new
-        @resource = klass.new
-      elsif action == :create
-        @resource = klass.new(params[controller.singularize])
-      elsif action == :index
-        @resources = klass.all
-      end
-      
-    end
-
-    # -----------  LAYOUT --------------
-    def title (st)                                                                         #allow templates to set page title
-      @layout[:title] = strip_tags st 
-    end
-    def h1 (st)                                                                            #allow templates to set page h1
-      @layout[:h1] = st
-    end
-    def title_h1 (st)                                                                      #allow templates to set page title and h1 at same time
-      h1(st)
-      title(st)
-    end
-    def h1_emph(st)                                                                        #uniform way to make part of the h1 stand out
-      "<em>#{st}</em>"
-    end
-    def h1_name(st)                                                                        #uniform way of displaying model names in h1 
-      h1_emph "\"#{st.titleize}\""
-    end
-
-    # -----------  UTILS --------------
-    def strip_tags (str)
-      str.gsub(/<\/?[^>]*>/, "")
-    end
-    def tweet(st='')
-      puts "-----------#{st}----------------".green
-    end
-    def app_controllers
-      Dir['app/controllers/*.rb'].map {|f| File.basename(f, '.*').camelize.constantize}
-    end
-    def app_models
-      Dir['app/models/*.rb'].map {|f| File.basename(f, '.*').camelize.constantize }
-    end
-    
-
-
-    private
-      def default_view_title                                                               #sets h1 and <title> defaults to something sensible, in the absense of explicit setting
-        resource = get_resource_from_params
-
-        return if resource.nil?
-
-        case params[:action]
-        when 'new'
-          title_h1 "New #{params[:controller].singularize.titleize}"
-        when 'create'
-          title_h1 "New #{params[:controller].singularize.titleize} (with errors)"
-        when 'show'
-          title_h1 "#{params[:controller].singularize.titleize}: #{begin resource.name.titleize rescue resource.id end }"
-        when 'edit'
-          title_h1 "Editing #{params[:controller].singularize.titleize}: #{begin resource.name.titleize rescue resource.id end}"
-        when 'update'
-          title_h1 "Editing #{params[:controller].singularize.titleize} (with errors)"
-        when 'index'
-          title_h1 "Listing #{params[:controller].titleize}"
-        else
-          "{Default Title}"
-        end
-      end
-      def get_resource_from_params                                                         #gets @event for url events/show, and @events from /events/index
-        begin #nested controllers are working at the moment.
-          if params[:action] == 'index'
-            instance_variable_get('@' + params[:controller])
-          else
-            instance_variable_get('@' + params[:controller].singularize)
-          end
-        rescue
-          nil
+          "{#{params[:controller]}: #{params[:action]}}"
         end
       end
   end

data/lib/to-do.txt

@@ -0,0 +1,3 @@
+to-do.txt
+
+add instructions generator

data/pixelearth.gemspec

@@ -16,14 +16,12 @@ Gem::Specification.new do |s|
   s.add_dependency "haml-rails" 
   s.add_dependency "RedCloth"
   s.add_dependency "formtastic"
+  s.add_dependency "redgreen" #colorizes output for tests, 'required' test/test_helper.rb
+  s.add_dependency "colored"  #colored output in terminal  http://github.com/defunkt/colored/blob/master/lib/colored.rb
 
 
   s.add_development_dependency "ruby-debug"
-  s.add_development_dependency "redgreen" #colorizes output for tests, 'required' test/test_helper.rb
-  s.add_development_dependency "colored"  #colored output in terminal  http://github.com/defunkt/colored/blob/master/lib/colored.rb
 
-  
-  
 
   s.rubyforge_project = ""
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pixelearth
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Benjamin Lieb
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: redgreen
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -72,10 +72,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: redgreen
+  name: colored
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -86,10 +86,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: colored
+  name: ruby-debug
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -158,6 +158,7 @@ files:
 - lib/required/ruby_core_mods.rb
 - lib/required/sass.rb
 - lib/required/string.rb
+- lib/to-do.txt
 - pixelearth.gemspec
 has_rdoc: true
 homepage: ""