conjoin 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1323a2c159994b3c2e7a58f0f8b85e42e392df
-  data.tar.gz: 726ed880c4471213259ddfa3c6f3bf8126a5e6e9
+  metadata.gz: 37b3b3e0dea3d26b4c82214d197eb158e543c5da
+  data.tar.gz: 3b309564ec3d2a4cf8077d104f9cdeb8a39f1c79
 SHA512:
-  metadata.gz: 623b8011f05b0e4582542f387d2787c07949e85aa97108bccd853edaa7326ad9ec032f9c6b58c127b8516320aec4a3cbf471e8c58ca981e242ada3463de98391
-  data.tar.gz: 33c5837e860eb51212f2049f0b3db5b1a68a062f7a7f330e0cee5c58a3823a60c66a820cccd8662df5623bcc6df20d3ec1a1f63a60ed1b5123f8449d31e42f3d
+  metadata.gz: 017d486d53c6159088e8d2facb64e9956519d9d81852688c4e20ea209d4debf43d884b1e5de2dd4407425eb3334041d2790559cc8767cfd5e21afd6f7a617f6b
+  data.tar.gz: fa8ddf1a40b6035986e16799695891208c6d2f09b1adaaafc1adb73ce8966cb6ae3211ab0aa6947f491c7771fac27d5fc33a925ba00866bb56552050007bb92e

data/lib/conjoin.rb

@@ -25,6 +25,10 @@ module Conjoin
   autoload :I18N        , "conjoin/i18n"
   autoload :Widgets     , "conjoin/widgets"
   autoload :Csrf        , "conjoin/csrf"
+  autoload :As          , "conjoin/as"
+  autoload :Ui          , "conjoin/ui"
+  autoload :JQuery      , "conjoin/jquery"
+  autoload :Nav         , "conjoin/nav"
   # ActionMailer
   # https://gist.github.com/acwright/1944639
   # DelayedJob

data/lib/conjoin/as.rb

@@ -0,0 +1,38 @@
+module Conjoin
+  module As
+    # Public: Sugar to do some common response tasks
+    #
+    # http_code     - Response status code (default: 200)
+    # extra_headers - Extra headers hash (default: {})
+    #
+    # Examples:
+    #
+    #   on post, "users" do
+    #     as 201 do
+    #       "User successfully created!"
+    #     end
+    #   end
+    def as(http_code = 200, extra_headers = {}, &block)
+      res.status = http_code
+      res.headers.merge! extra_headers
+      yield if block
+    end
+
+    # Public: Sugar to do some common response tasks as_json
+    #
+    # http_code     - Response status code (default: 200)
+    # extra_headers - Extra headers hash (default: {})
+    # Examples:
+    #
+    #   on post, "users" do
+    #     as_json 201 do
+    #       "User successfully created!"
+    #     end
+    #   end
+    def as_json(http_code = 200, extra_headers = {}, &block)
+      require 'json'
+      extra_headers["Content-Type"] ||= "application/json"
+      as(http_code, extra_headers) { yield.to_json if block }
+    end
+  end
+end

data/lib/conjoin/assets.rb

@@ -81,13 +81,13 @@ module Conjoin
       Assets.app.settings[:assets]
     end
 
-    def  links_for type, opts = {}
+    def links_for type, opts = {}
       method    = :link
       path      = :href
       extention = :css
 
       options = {
-        'data-turbolinks-track' => true
+        'data-turbolinks-track' => 'true'
       }
 
       case type

data/lib/conjoin/auth.rb

@@ -30,7 +30,7 @@ module Conjoin
 
     def current_user
       if not Conjoin.env.mounted?
-        authenticated(VendorWizard::User)
+        authenticated(Subro::Models::User)
       else
         req.env['warden'].authenticate(scope: :user)
       end

data/lib/conjoin/cuba.rb

@@ -64,7 +64,7 @@ module Conjoin
       end
 
       def partial template, locals = {}
-        partial_template = template.gsub(/([a-zA-Z_]+)$/, '_\1')
+        partial_template = template.to_s.gsub(/([a-zA-Z_]+)$/, '_\1')
         render(template_path(partial_template), locals, settings[:render][:options])
       end
     end

data/lib/conjoin/form_builder.rb

@@ -3,9 +3,9 @@ require "rack/csrf"
 module Conjoin
   module FormBuilder
     INPUTS = [
-      :boolean, :checkbox, :date, :decimal, :file, :hidden,
-      :integer, :password, :radio, :select, :state, :string,
-      :time
+      :boolean , :checkbox , :date  , :decimal , :file  , :hidden ,
+      :integer , :password , :radio , :select  , :state , :string ,
+      :display , :datetime , :time  , :year
     ]
 
     def self.setup app

data/lib/conjoin/inputs/datetime.rb

@@ -0,0 +1,11 @@
+module Conjoin
+  module FormBuilder
+    class DatetimeInput < Input
+      def display
+        options[:date] = true
+        options[:value] = R18n.l options[:value]
+        super
+      end
+    end
+  end
+end

data/lib/conjoin/inputs/display.rb

@@ -0,0 +1,16 @@
+module Conjoin
+  module FormBuilder
+    class DisplayInput < Input
+      def display
+        options[:class].gsub!(/form-control/, '')
+        options[:class] += ' form-control-static'
+
+        mab do
+          p class: options[:class] do
+            text options[:value]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/conjoin/inputs/radio.rb

@@ -7,25 +7,25 @@ module Conjoin
 
         radios = options[:radios] || [:yes, :no]
 
-        opts = options.dup
-
         mab do
-          div class: 'form-control' do
-            radios.each_with_index do |name, i|
-              name = name.to_s
-              opts[:value] = name
-              opts[:id]    =  "#{options[:id]}_#{i}"
+          radios.each_with_index do |name, i|
+            opts = options.dup
+
+            name = name.to_s
+            opts[:value] = name
+            opts[:id]    =  "#{options[:id]}_#{i}"
 
-              if (opts[:value] == 'no' and data.value == false) \
-              or (opts[:value] == 'yes' and data.value == true) \
-              or (opts[:value] == data.value)
-                opts[:checked] = 'checked'
-              else
-                opts.delete :checked
-              end
+            if (opts[:value] == 'no' and data.value == 'no') \
+            or (opts[:value] == 'yes' and data.value == 'yes') \
+            or (opts[:value] == data.value)
+              opts[:checked] = 'checked'
+            else
+              opts.delete :checked
+            end
 
+            label class: 'radio-inline' do
               input opts
-              span name.humanize
+              text! name.humanize
             end
           end
         end

data/lib/conjoin/inputs/select.rb

@@ -1,30 +1,31 @@
 module Conjoin
   module FormBuilder
     class SelectInput < Input
-      @select_options = {}
-
       def display
-        mab do
+        append_button = options.delete :append_button
+
+        content = mab do
           # automatically add a prompt by default
-          options[:prompt] = true unless options.key? :prompt
-          options[:class] += ' select2'
+          options[:prompt] = 'true' unless options.key? :prompt
+          options[:class] += ' selectize'
           selected_value = options.delete :value
 
           select options do
+            opts = {
+              value: ''
+            }
+
             if prompt = options.delete(:prompt)
-              opts = {
-                value: ''
-              }
               opts['selected'] = 'selected' unless selected_value
               option opts do
-                text prompt.to_s == 'true' ? 'Please Choose One.' : prompt
+                text! prompt.to_s == 'true' ? 'Please Choose One.' : prompt
               end
             end
 
             if not options[:group]
-              select_options.each do |name, value|
+              select_options.invert.each do |name, value|
                 option render_opts(value, selected_value, opts) do
-                  text name.titleize
+                  text (name != name.upcase ? name.titleize : name)
                 end
               end
             else
@@ -40,6 +41,21 @@ module Conjoin
             end
           end
         end
+
+        if not append_button
+          content
+        else
+          mab do
+            div class: 'input-group' do
+              text! content
+              div class: 'input-group-btn' do
+                button class: 'btn btn-primary', type: 'button', 'on-click-get' => append_button[:href] do
+                  text append_button[:text]
+                end
+              end
+            end
+          end
+        end
       end
 
       def render_opts value, selected_value, opts
@@ -49,19 +65,11 @@ module Conjoin
         if selected_value.is_a? ActiveRecord::Associations::CollectionProxy
           opts['selected'] = 'selected' if selected_value.map(&:id).include? value
         else
-          opts['selected'] = 'selected' if selected_value == value.to_s
+          opts['selected'] = 'selected' if selected_value.to_s == value.to_s
         end
 
         opts
       end
-
-      def self.select_options
-        @select_options
-      end
-
-      def select_options
-        self.class.select_options.invert
-      end
     end
   end
 end

data/lib/conjoin/inputs/state.rb

@@ -3,66 +3,68 @@ require_relative 'select'
 module Conjoin
   module FormBuilder
     class StateInput < SelectInput
-      @select_options = {
-        'AL' => 'Alabama',
-        'AK' => 'Alaska',
-        'AS' => 'America Samoa',
-        'AZ' => 'Arizona',
-        'AR' => 'Arkansas',
-        'CA' => 'California',
-        'CO' => 'Colorado',
-        'CT' => 'Connecticut',
-        'DE' => 'Delaware',
-        'DC' => 'District of Columbia',
-        'FM' => 'Micronesia',
-        'FL' => 'Florida',
-        'GA' => 'Georgia',
-        'GU' => 'Guam',
-        'HI' => 'Hawaii',
-        'ID' => 'Idaho',
-        'IL' => 'Illinois',
-        'IN' => 'Indiana',
-        'IA' => 'Iowa',
-        'KS' => 'Kansas',
-        'KY' => 'Kentucky',
-        'LA' => 'Louisiana',
-        'ME' => 'Maine',
-        'MH' => 'Islands',
-        'MD' => 'Maryland',
-        'MA' => 'Massachusetts',
-        'MI' => 'Michigan',
-        'MN' => 'Minnesota',
-        'MS' => 'Mississippi',
-        'MO' => 'Missouri',
-        'MT' => 'Montana',
-        'NE' => 'Nebraska',
-        'NV' => 'Nevada',
-        'NH' => 'New Hampshire',
-        'NJ' => 'New Jersey',
-        'NM' => 'New Mexico',
-        'NY' => 'New York',
-        'NC' => 'North Carolina',
-        'ND' => 'North Dakota',
-        'OH' => 'Ohio',
-        'OK' => 'Oklahoma',
-        'OR' => 'Oregon',
-        'PW' => 'Palau',
-        'PA' => 'Pennsylvania',
-        'PR' => 'Puerto Rico',
-        'RI' => 'Rhode Island',
-        'SC' => 'South Carolina',
-        'SD' => 'South Dakota',
-        'TN' => 'Tennessee',
-        'TX' => 'Texas',
-        'UT' => 'Utah',
-        'VT' => 'Vermont',
-        'VI' => 'Virgin Island',
-        'VA' => 'Virginia',
-        'WA' => 'Washington',
-        'WV' => 'West Virginia',
-        'WI' => 'Wisconsin',
-        'WY' => 'Wyoming'
-      }
+      def select_options
+        {
+          'AL' => 'Alabama',
+          'AK' => 'Alaska',
+          'AS' => 'America Samoa',
+          'AZ' => 'Arizona',
+          'AR' => 'Arkansas',
+          'CA' => 'California',
+          'CO' => 'Colorado',
+          'CT' => 'Connecticut',
+          'DE' => 'Delaware',
+          'DC' => 'District of Columbia',
+          'FM' => 'Micronesia',
+          'FL' => 'Florida',
+          'GA' => 'Georgia',
+          'GU' => 'Guam',
+          'HI' => 'Hawaii',
+          'ID' => 'Idaho',
+          'IL' => 'Illinois',
+          'IN' => 'Indiana',
+          'IA' => 'Iowa',
+          'KS' => 'Kansas',
+          'KY' => 'Kentucky',
+          'LA' => 'Louisiana',
+          'ME' => 'Maine',
+          'MH' => 'Islands',
+          'MD' => 'Maryland',
+          'MA' => 'Massachusetts',
+          'MI' => 'Michigan',
+          'MN' => 'Minnesota',
+          'MS' => 'Mississippi',
+          'MO' => 'Missouri',
+          'MT' => 'Montana',
+          'NE' => 'Nebraska',
+          'NV' => 'Nevada',
+          'NH' => 'New Hampshire',
+          'NJ' => 'New Jersey',
+          'NM' => 'New Mexico',
+          'NY' => 'New York',
+          'NC' => 'North Carolina',
+          'ND' => 'North Dakota',
+          'OH' => 'Ohio',
+          'OK' => 'Oklahoma',
+          'OR' => 'Oregon',
+          'PW' => 'Palau',
+          'PA' => 'Pennsylvania',
+          'PR' => 'Puerto Rico',
+          'RI' => 'Rhode Island',
+          'SC' => 'South Carolina',
+          'SD' => 'South Dakota',
+          'TN' => 'Tennessee',
+          'TX' => 'Texas',
+          'UT' => 'Utah',
+          'VT' => 'Vermont',
+          'VI' => 'Virgin Island',
+          'VA' => 'Virginia',
+          'WA' => 'Washington',
+          'WV' => 'West Virginia',
+          'WI' => 'Wisconsin',
+          'WY' => 'Wyoming'
+        }
+      end
     end
   end
 end

data/lib/conjoin/inputs/year.rb

@@ -0,0 +1,18 @@
+require_relative 'select'
+
+module Conjoin
+  module FormBuilder
+    class YearInput < SelectInput
+      def select_options
+        years_select = {}
+        years = (1900..(Date.today.year+2)).to_a.reverse!
+
+        years.each do |year|
+          years_select[year] = year.to_s
+        end
+
+        years_select
+      end
+    end
+  end
+end

data/lib/conjoin/jquery.rb

@@ -0,0 +1,50 @@
+module Conjoin
+  class JQuery
+    JS_ESCAPE = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
+
+    attr_accessor :html, :selector, :options
+
+    def initialize selector, options = {}
+      @html     = ''
+      @selector = selector
+      @options  = options
+
+      @options.empty? \
+        ? @html += "$('#{selector}')" \
+        : @html += "$('#{selector}', #{options.to_json})"
+    end
+
+    def method_missing(m, *args, &block)
+      elem = args.first
+
+      case elem
+      when JQuery
+        content = elem.to_s.chomp(';')
+      when String
+        content = "'#{escape elem}'"
+      when Hash, OpenStruct
+        content = elem.to_json
+      else
+        content = elem
+      end
+
+      @html += ".#{m.to_s.camelize(:lower)}(#{content})"
+
+      self
+    end
+
+    def to_s
+      return_html = html.dup.to_s
+      @html       = "$('#{selector}')"
+      "#{return_html};"
+    end
+
+    def escape js
+      Conjoin::JQuery.escape js
+    end
+
+    def self.escape js
+      js.to_s.gsub(/(\\|<\/|\r\n|\\3342\\2200\\2250|[\n\r"'])/) {|match| JS_ESCAPE[match] }
+    end
+  end
+end

data/lib/conjoin/middleware.rb

@@ -26,9 +26,11 @@ module Conjoin
           if Conjoin.env.test? or Conjoin.env.development?
             require 'better_errors'
             use BetterErrors::Middleware
-          #   require 'pry'
-          #   require 'pry-rescue'
-          #   use PryRescue::Rack
+            if ENV['PRY_RESCUE']
+              require 'pry'
+              require 'pry-rescue'
+              use PryRescue::Rack
+            end
           end
 
           # continue running the application

data/lib/conjoin/nav.rb

@@ -0,0 +1,63 @@
+module Conjoin
+  module Nav
+    def self.setup app
+      @settings = OpenStruct.new({
+        navs: OpenStruct.new,
+        icon_class: 'ico',
+        active_class: 'active open'
+      })
+      require "#{app.root}/config/nav.rb"
+    end
+
+    def self.settings
+      @settings
+    end
+
+    def self.config &block
+      Config.new(block, self).run
+    end
+
+    def nav name, &block
+      Config.new(block, self).load_nav name
+    end
+
+    class Config < Struct.new(:block, :app)
+      def run
+        self.instance_eval(&block)
+      end
+
+      def add_menu name, links
+        config.navs[name] ||= []
+        config.navs[name].concat links
+      end
+
+      def load_nav name
+        if links = config.navs[name]
+          loaded_links = []
+
+          links.each do |link|
+            link = OpenStruct.new(link)
+
+            if !link.if or app.instance_exec(&link.if)
+              link.icon         = config.icon_class + '-' + link.icon if link.icon
+              link.active       = app.req.env['REQUEST_PATH'][link.path]
+              link.active_class = link.active ? config.active_class : false
+
+              if link.active_class or !link.hidden
+                loaded_links << link
+              end
+            end
+          end
+        else
+          raise "There isn't a nav called: #{name}"
+        end
+
+        block.call loaded_links
+      end
+
+      def config
+        Conjoin::Nav.settings
+      end
+    end
+  end
+end

data/lib/conjoin/ui.rb

@@ -0,0 +1,25 @@
+module Conjoin
+  module Ui
+    def panel options = {}, &block
+      helper = self
+
+      mab do
+        div class: 'panel panel-default', id: options[:id] do
+          if options.key? :header
+            div class: 'panel-heading' do
+              h3 class: 'panel-title' do
+                if options.key? :icon
+                  fa_icon options[:icon]
+                end
+                text! options[:header]
+              end
+            end
+          end
+          div class: "panel-body #{options.key?(:no_padding) ? 'no-padding' : ''}" do
+            text! helper.instance_exec(&block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/conjoin/widgets.rb

@@ -74,7 +74,7 @@ module Conjoin
 
     def url_for_event event, options = {}
       widget_name = req.env[:widget_name]
-      "#{Conjoin.env.mounted?? settings[:mounted_url] : ''}/widgets?widget_event=#{event}&widget_name=#{widget_name}&" + URI.encode_www_form(options)
+      "#{Conjoin.env.mounted?? settings[:mounted_url] : ''}/widgets?widget_event=#{event}&widget_name=#{widget_name}" + (options.any?? '&' + URI.encode_www_form(options) : '')
     end
 
     def load_widgets
@@ -184,7 +184,9 @@ module Conjoin
 
         res.write '$("' + selector + '").replaceWith("' + escape(content) + '");'
         # scroll to the top of the page just as if we went to the url directly
-        res.write 'window.scrollTo(0, 0);'
+        # if opts[:scroll_to_top]
+        #   res.write 'window.scrollTo(0, 0);'
+        # end
       end
 
       def hide selector
@@ -209,6 +211,11 @@ module Conjoin
         js.to_s.gsub(/(\\|<\/|\r\n|\\3342\\2200\\2250|[\n\r"'])/) {|match| JS_ESCAPE[match] }
       end
 
+      def trigger event, data = {}
+        req.env[:widget_name] = req.params['widget_name']
+        trigger_event event, req.env[:widget_name], data.to_ostruct
+      end
+
       def trigger_event event, widget_name, data = {}
         if events = self.class.events
           events.each do |class_event, opts|
@@ -233,6 +240,15 @@ module Conjoin
         render state: widget_state
       end
 
+      def partial view, options
+        render view, options
+      end
+
+      def partial template, locals = {}
+        locals[:partial] = template
+        render locals
+      end
+
       def render *args
         if args.first.kind_of? Hash
           locals = args.first
@@ -252,20 +268,26 @@ module Conjoin
           end
         end
 
-        if locals.key?(:state) and state.to_s == view.to_s
-          return send state
+        if locals.key?(:state) and state and state.to_s == view.to_s
+          if method(state).parameters.length > 0
+            send(state, locals)
+          else
+            send(state)
+          end
         end
 
         tmpl_engine = settings[:render][:template_engine]
 
         if (req_helper_methods = req.env[:widgets][folder][:req_helper_methods]) \
         and (!options.key?(:cache))
-          locals.merge! req_helper_methods
+          locals.reverse_merge! req_helper_methods
         else
           req.env[:widgets][folder][:req_helper_methods] = {}
 
           helper_methods.each do |method|
-            req.env[:widgets][folder][:req_helper_methods][method] = locals[method] = self.send method
+            unless locals.key? method
+              req.env[:widgets][folder][:req_helper_methods][method] = locals[method] = self.send method
+            end
           end
         end
 
@@ -274,7 +296,8 @@ module Conjoin
 
         locals[:w] = locals[:widget] = self
 
-        app.render "#{app.widgets_root}/#{folder}/#{view}.#{tmpl_engine}", locals
+        view_folder = self.class.to_s.gsub(/\w+::Widgets::/, '').split('::').map(&:underscore).join('/')
+        app.render "#{app.widgets_root}/#{view_folder}/#{view}.#{tmpl_engine}", locals
       end
 
       private
@@ -321,6 +344,7 @@ module Conjoin
         App.plugin Conjoin::I18N
         App.plugin Conjoin::FormBuilder
         App.plugin Conjoin::Widgets
+        App.plugin Conjoin::Ui
 
         App
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -319,6 +319,7 @@ files:
 - conjoin.gemspec
 - lib/conjoin.rb
 - lib/conjoin/active_record.rb
+- lib/conjoin/as.rb
 - lib/conjoin/assets.rb
 - lib/conjoin/auth.rb
 - lib/conjoin/class_methods.rb
@@ -330,7 +331,9 @@ files:
 - lib/conjoin/inputs/boolean.rb
 - lib/conjoin/inputs/checkbox.rb
 - lib/conjoin/inputs/date.rb
+- lib/conjoin/inputs/datetime.rb
 - lib/conjoin/inputs/decimal.rb
+- lib/conjoin/inputs/display.rb
 - lib/conjoin/inputs/file.rb
 - lib/conjoin/inputs/hidden.rb
 - lib/conjoin/inputs/integer.rb
@@ -340,12 +343,16 @@ files:
 - lib/conjoin/inputs/state.rb
 - lib/conjoin/inputs/string.rb
 - lib/conjoin/inputs/time.rb
+- lib/conjoin/inputs/year.rb
+- lib/conjoin/jquery.rb
 - lib/conjoin/middleware.rb
+- lib/conjoin/nav.rb
 - lib/conjoin/recursive_ostruct.rb
 - lib/conjoin/seeds.rb
 - lib/conjoin/tasks.rb
 - lib/conjoin/tasks/migrate.rake
 - lib/conjoin/tasks/migrate.rb
+- lib/conjoin/ui.rb
 - lib/conjoin/version.rb
 - lib/conjoin/widgets.rb
 homepage: ''