hobo 1.3.3 → 1.4.0.pre2

data/{lib/hobo/helper/translations.rb → app/helpers/hobo_translations_helper.rb}

@@ -1,8 +1,6 @@
-module Hobo
-  module Helper
-    module Translations
-
-      include Normalizer
+module HoboTranslationsHelper
+  extend HoboHelperBase
+  protected
 
 =begin
 
@@ -49,6 +47,5 @@ en:
 
 
 
-    end
-  end
 end
+

data/{lib/hobo/helper/translations/normalizer.rb → app/helpers/hobo_translations_normalizer_helper.rb}

@@ -1,10 +1,6 @@
-require 'active_support/core_ext/string/output_safety'
-module Hobo
-  module Helper
-    module Translations
-      module Normalizer
-
-        private
+module HoboTranslationsNormalizerHelper
+  extend HoboHelperBase
+  private
 
         def normalize_args(key, options={})
           if (key.class == Hash) # called as a tag
@@ -33,7 +29,4 @@ module Hobo
           end
         end
 
-      end
-    end
-  end
 end

data/app/helpers/hobo_type_helper.rb

@@ -0,0 +1,24 @@
+module HoboTypeHelper
+  extend HoboHelperBase
+  protected
+    def type_id(type=nil)
+      type ||= (this.is_a?(Class) && this) || this_type || this.class
+      HoboFields.to_name(type) || type.name.to_s.underscore.gsub("/", "__")
+    end
+
+
+    def type_and_field(*args)
+      type, field = args.empty? ? [this_parent.class, this_field] : args
+      "#{type.typed_id}_#{field}" if type.respond_to?(:typed_id)
+    end
+
+
+    def model_id_class(object=this, attribute=nil)
+      object.respond_to?(:typed_id) ? "model::#{typed_id(object, attribute).to_s.dasherize}" : ""
+    end
+
+
+    def css_data(name, *args)
+      "#{name.to_s.dasherize}::#{args * '::'}"
+    end
+end

data/app/helpers/hobo_view_hint_helper.rb

@@ -0,0 +1,13 @@
+module HoboViewHintHelper
+  extend HoboHelperBase
+  protected
+    # --- ViewHint Helpers --- #
+
+    def this_field_name
+      this_parent.class.try.human_attribute_name(this_field) || this_field
+    end
+
+    def this_field_help
+      this_parent.class.try.attribute_help(this_field.to_sym) || ""
+    end
+end

data/hobo.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_runtime_dependency('hobo_fields', ["= #{version}"])
   s.add_runtime_dependency('dryml', ["= #{version}"])
-  s.add_runtime_dependency('will_paginate', [">= 3.0.0"])
+  s.add_runtime_dependency('will_paginate', ["~> 3.0.0"])
 
-  s.add_development_dependency('rubydoctest', [">= 0"])
+  s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('shoulda', [">= 0"])
-  s.add_development_dependency('irt', [">= 0.7.5"])
+  s.add_development_dependency('irt', [">= 1.2.10"])
 
   s.executables = ["hobo"]
   s.files = `git ls-files -x #{name}/* -z`.split("\0")

data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb

@@ -12,10 +12,6 @@ module Hobo
       "rails generate hobo:admin_subsite [NAME=admin] [options]"
     end
 
-    def generate_admin_css
-      template "admin.css", File.join("public/stylesheets/#{file_name}.css")
-    end
-
     def generate_admin_user_controller
       invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"], options
       template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml"
@@ -25,11 +21,6 @@ module Hobo
       invoke 'hobo:subsite_taglib', [name], options.merge(:admin => true)
     end
 
-    def append_admin_tag_into_application_taglib
-      destination = File.join(Rails.root, "app/views/taglibs/application.dryml")
-      append_file(destination) { eval_template('admin_tag_injection.erb') }
-    end
-
     include Generators::Hobo::Subsite
 
   end

data/lib/generators/hobo/admin_subsite/templates/application.dryml

@@ -1 +1,3 @@
 <!-- Global taglib - these tags are shared across all subsites -->
+
+<include src="rapid" gem="hobo"/>

data/lib/generators/hobo/admin_subsite/templates/site.css.erb

@@ -0,0 +1,9 @@
+/*
+ * This is the stylesheet manifest file for the <%= name %> subsite.
+ * Files or plugins referenced from here or placed in the <%= name %>/
+ * directory will be included.
+ *
+ *= require_self
+ *= require application
+ *= require_tree ./<%= name %>
+*/

data/lib/generators/hobo/admin_subsite/templates/site.js.erb

@@ -0,0 +1,10 @@
+// This is a manifest file for the <%= name %> subsite.  It will be
+// compiled into including all the files listed below.  Add new
+// JavaScript/Coffee code in separate files in the <%= name %>
+// directory and they'll automatically be included in the compiled
+// file accessible from http://example.com/assets/<%= name %>.js It's
+// not advisable to add code directly here, but if you do, it'll
+// appear at the bottom of the the compiled file.
+//
+//= require application
+//= require_tree ./<%= name %>

data/lib/generators/hobo/assets/assets_generator.rb

@@ -8,10 +8,24 @@ module Hobo
 
     def copy_rapid_files
       template  'application.dryml.erb',        'app/views/taglibs/application.dryml'
-      copy_file 'application.css',              'public/stylesheets/application.css'
-      copy_file 'dryml-support.js',             'public/javascripts/dryml-support.js'
+      template  'front_site.dryml.erb',         'app/views/taglibs/front_site.dryml'
+      #copy_file 'dryml-support.js',             'public/javascripts/dryml-support.js'
       copy_file 'dryml_taglibs_initializer.rb', 'config/initializers/dryml_taglibs.rb'
       copy_file 'guest.rb',                     'app/models/guest.rb'
+
+      FileUtils.mv 'app/assets/stylesheets/application.css', 'app/assets/stylesheets/application.css.orig'
+      copy_file 'application.css',                        'app/assets/stylesheets/application.css'
+      copy_file 'gitkeep',                                'app/assets/stylesheets/application/.gitkeep'
+      copy_file 'front.css',                              'app/assets/stylesheets/front.css'
+      copy_file 'gitkeep',                                'app/assets/stylesheets/front/.gitkeep'
+
+      FileUtils.mv 'app/assets/javascripts/application.js', 'app/assets/javascripts/application.js.orig'
+      copy_file 'application.js',                        'app/assets/javascripts/application.js'
+      copy_file 'gitkeep',                               'app/assets/javascripts/application/.gitkeep'
+      copy_file 'front.js',                              'app/assets/javascripts/front.js'
+      copy_file 'gitkeep',                               'app/assets/javascripts/front/.gitkeep'
+
+      application "config.assets.precompile += %w(front.css front.js)"
     end
 
   end

data/lib/generators/hobo/assets/templates/application.css

@@ -0,0 +1,9 @@
+/*
+ * This is the global stylesheet manifest file.  Files or plugins
+ * referenced from here or placed in the application/ directory will be
+ * included in all subsites.  This file is included by front.css and all
+ * subsites.
+ *
+ *= require_self
+ *= require_tree ./application
+*/

data/lib/generators/hobo/assets/templates/application.dryml.erb

@@ -2,8 +2,3 @@
 
 <include src="rapid" gem="hobo"/>
 
-<include src="taglibs/auto/rapid/cards"/>
-<include src="taglibs/auto/rapid/pages"/>
-<include src="taglibs/auto/rapid/forms"/>
-
-<set-theme name="clean"/>

data/lib/generators/hobo/assets/templates/application.js

@@ -0,0 +1,11 @@
+// This file is included in all sites and subsites.  This is a
+// manifest file that'll be compiled into including all the files
+// listed below.  Add new JavaScript/Coffee code in separate files in
+// the application directory and they'll automatically be included.
+// It's not advisable to add code directly here, but if you do, it'll
+// appear at the bottom of the the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require_tree ./application

data/lib/generators/hobo/assets/templates/front.css

@@ -0,0 +1,10 @@
+/*
+ * This is the stylesheet manifest file for the front subsite (which
+ * is your whole application if you don't have any subsites).  Files
+ * or plugins referenced from here or placed in the front/ directory
+ * will be included.
+ *
+ *= require_self
+ *= require application
+ *= require_tree ./front
+*/

data/lib/generators/hobo/assets/templates/front.js

@@ -0,0 +1,11 @@
+// This is a manifest file for the front subsite (which is your whole
+// application if you don't have any subsites).  It will be compiled
+// into including all the files listed below.  Add new
+// JavaScript/Coffee code in separate files in the front directory and
+// they'll automatically be included in the compiled file accessible
+// from http://example.com/assets/front.js It's not advisable to add
+// code directly here, but if you do, it'll appear at the bottom of
+// the the compiled file.
+//
+//= require application
+//= require_tree ./front

data/lib/generators/hobo/assets/templates/front_site.dryml.erb

@@ -0,0 +1,6 @@
+<!-- Global taglib - these are the tags for your front site -->
+
+<include src="taglibs/auto/rapid/cards"/>
+<include src="taglibs/auto/rapid/pages"/>
+<include src="taglibs/auto/rapid/forms"/>
+

data/lib/generators/hobo/dev_tweaks/dev_tweaks_generator.rb

@@ -0,0 +1,31 @@
+require 'bundler/cli'
+module Hobo
+  class DevTweaksGenerator < Rails::Generators::Base
+
+    include Generators::Hobo::Plugin
+
+    desc "install the rails-dev-tweaks plugin & configure it"
+    def add_dev_tweaks
+      say "Adding rails-dev-tweaks gem"
+      gem_with_comments('rails-dev-tweaks', :version => "~> 0.6.1", :comments => "\n# The asset pipeline in Rails is really slow in development mode.\n# Hobo has a lot of assets, so speed it up with rails-dev-tweaks", :group => :development)
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+
+      # environment :env => :development action is broken
+      inject_into_file "config/environments/development.rb", :before => /end(?!.*end)/m do
+        """
+  # By default, rails-dev-tweaks also applies to XHR, but that's not a great default for Hobo
+  config.dev_tweaks.autoload_rules do
+    keep :all
+
+    skip '/favicon.ico'
+    skip :assets
+    keep :xhr
+    keep :forced
+  end
+"""
+      end
+    end
+  end
+end

data/lib/generators/hobo/i18n/templates/hobo.en.yml

@@ -114,7 +114,7 @@ en:
       update:
         no_attribute_error: "No update specified in params"
         success: "Changes to the %{model} were saved"
-        error: "There was a problem with that change.\n%{errors}"
+        error: "There was a problem with that change.\\n%{errors}"
       destroy:
         success: "The %{model} was deleted"
       signup:

data/lib/generators/hobo/install_plugin/USAGE

@@ -0,0 +1,3 @@
+Description:
+
+    Installs a Hobo plugin.

data/lib/generators/hobo/install_plugin/install_plugin_generator.rb

@@ -0,0 +1,36 @@
+require 'bundler/cli'
+module Hobo
+  class InstallPluginGenerator < Rails::Generators::NamedBase
+
+    include Generators::Hobo::Plugin
+
+    desc """This generator installs a hobo plugin.
+
+The first argument is the name of the plugin, and the second is where
+to get it.  If the second argument is not supplied, it is installed
+from rubygems.org or any other gem source listed in your Gemfile.  If
+the second argument contains a colon (:), it is assumed to be a git
+URL.  Otherwise it is considered to be a path.
+
+If you are installing a Hobo theme, you probably want to use the options
+`--subsite=front --css-top`.
+"""
+
+    argument :name, :desc => "the plugin name"
+    argument :git_path, :required => false, :desc => "if supplied, is passed to the :git or :path option in the gemfile"
+    class_option :skip_gem, :type => :boolean, :aliases => '-M', :desc => "don't add plugin to Gemfile"
+    class_option :skip_js, :type => :boolean, :aliases => '-J', :desc => "don't add require to application.js"
+    class_option :skip_css, :type => :boolean, :aliases => '-C', :desc => "doesn't add require to application.css"
+    class_option :version, :type => :string, :aliases => '-v', :desc => "Gemspec version string"
+    class_option :comments, :type => :string, :desc => "comments to add before require/include"
+    class_option :subsite, :type => :string, :aliases => '-e', :default => "application", :desc => "Subsite name (without '_site') or 'all' or 'application'"
+    class_option :css_top, :type => :boolean, :desc => "add the require statement to the top of the CSS file rather tahn the bottom."
+
+    def install_plugin
+      if install_plugin_helper(name, git_path, options)
+        invoke(Bundler::CLI, :update, [], {})
+      end
+    end
+  end
+end
+

data/lib/generators/hobo/plugin.rb

@@ -0,0 +1,112 @@
+module Generators
+  module Hobo
+    Plugin = classy_module do
+
+      protected
+      def gem_with_comments(*args)
+        options = args.extract_options!
+        name = args[0]
+
+        unless File.read("Gemfile") =~ /^gem ("|')#{name}/
+          if (comments = options.delete(:comments))
+            append_file "Gemfile", "#{comments}\n", :verbose => false
+          end
+
+          gem(args[0], args[1], options)
+          true
+        else
+          false
+        end
+      end
+
+      def install_plugin_helper(name, git_path, options)
+        plugin = name.dup
+        unless options[:skip_gem]
+          gem_options = {}
+          if git_path
+            if git_path =~ /:/
+              gem_options[:git] = git_path
+            else
+              gem_options[:path] = git_path
+            end
+          end
+          gem_options[:comments] = "# #{options[:comments]}" if options[:comments]
+          need_update = gem_with_comments(plugin, gem_options[:version], gem_options)
+        end
+
+        if options[:subsite] == "all"
+          if Hobo.subsites.blank?
+            subsites = ['application']
+          else
+            subsites = ['front'] + Hobo.subsites
+          end
+        else
+          subsites = [options[:subsite] || 'application']
+        end
+
+        subsites.each do |subsite|
+          inject_js_require(name, subsite, options[:comments]) unless options[:skip_js]
+          inject_css_require(name, subsite, options[:comments], options[:css_top]) unless options[:skip_css]
+          inject_dryml_include(name, subsite, options[:comments])
+        end
+
+        return need_update
+      end
+
+      def inject_js_require(name, subsite, comments)
+        application_file = "app/assets/javascripts/#{subsite}.js"
+        pattern          = /\/\/=(?!.*\/\/=).*?$/m
+
+        unless exists?(application_file)
+          application_file = "#{application_file}.coffee"
+          pattern          = /#=(?!.*#=).*?$/m
+        end
+
+        raise Thor::Error, "Couldn't find either #{subsite}.js or #{subsite}.js.coffee files!" unless exists?(application_file)
+
+        inject_into_file application_file, :before=>pattern do
+          line = "//= require #{name}\n"
+          line = "//\n// #{comments}\n#{line}" if comments
+          line
+        end
+      end
+
+      def inject_css_require(name, subsite, comments, css_top)
+        application_file = "app/assets/stylesheets/#{subsite}.css"
+        if css_top
+          opts = {:after => /^\/\*.*?\*=.*?\n /m}
+        else
+          opts = {:before => /\*=(?!.*\*=).*?$/m}
+        end
+
+        raise Thor::Error, "Couldn't find #{subsite}.css!" unless exists?(application_file)
+
+        inject_into_file application_file, opts do
+          line = "*= require #{name}\n "
+          line = "*\n * #{comments}\n #{line}" if comments
+          line
+        end
+      end
+
+      def inject_dryml_include(name, subsite, comments)
+        subsite = "#{subsite}_site" unless subsite=="application"
+        application_file = "app/views/taglibs/#{subsite}.dryml"
+        pattern          = /\<include.*?\>(?!.*\<include.*?\>).*?\n/m
+
+        raise Thor::Error, "Couldn't find #{subsite}.dryml!" unless exists?(application_file)
+
+        inject_into_file application_file, :after=>pattern do
+          line = "\n<include gem='#{name}'/>\n"
+          line = "\n<%# #{comments} %>#{line}" if comments
+          line
+        end
+      end
+
+
+      def exists?(file)
+        File.exist?(File.join(destination_root, file))
+      end
+
+    end
+  end
+end