conjoin 0.0.21 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c9ef39ee2dee13d442462daf8ea8d8967c99aba
-  data.tar.gz: aca283c5e59d149b44b0adf8b467ef1589265429
+  metadata.gz: 814729b3877b608769a0767bb08013af609a2ece
+  data.tar.gz: c4ddaa823e0d215410944b8f7d53f7246389cfdf
 SHA512:
-  metadata.gz: 474037b0a7295a763528dfe11aa10b6925dbb7f9540fab3ff8d15729a799397f1a7e73b3d09e306dfa8f33ac73049defbcd5ff3f7661dc4619628c40edcba038
-  data.tar.gz: 5ef392bd3a125b9520bb01a064424dfc56a7d7b947cd0b6b4d96a03cd84116a33f579ff024e0a5126e5f2cc821cfd0801f95fc83dbf303c9cd6ad79cb8fcc7ce
+  metadata.gz: 1f9263e3e75d95c20d52132509e33829a1b7b8ddd6e79c1b8380c52eae9aa6019717de02f18f718cb3a5155779c0069538073b3f59c6889d5eaa7eef638d30eb
+  data.tar.gz: fd1900805e2aacd1dccb3eaa765618b60830d5ec31519dd6359ece189ec1db0760fa698a1caa6763947a40321f3e08ee2d6a914481c653b894905384109ee89d

data/conjoin.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mab"
   spec.add_dependency "tilt"
   spec.add_dependency "sass"
+  spec.add_dependency "stylus"
   spec.add_dependency "coffee-script"
   spec.add_dependency "slim"
   spec.add_dependency "mimemagic"

data/lib/conjoin/assets.rb

@@ -12,6 +12,8 @@ module Conjoin
       require 'slim'
       require 'sass'
       require 'ostruct'
+      require 'stylus'
+      require 'stylus/tilt/stylus'
 
       # if ENV['RACK_ENV'] != 'production'
       #   require 'rugged'
@@ -43,7 +45,7 @@ module Conjoin
       when '.css', '.js'
         path = "#{plugin.settings[:path] || '/'}#{cache_string}assets/#{file}"
       else
-        path = "#{plugin.settings[:path] || '/'}#{cache_string}assets/images/#{file}"
+        path = "#{plugin.settings[:path] || '/'}#{cache_string}assets/#{file}"
       end
       "http#{req.env['SERVER_PORT'] == '443' ? 's' : ''}://#{req.env['HTTP_HOST']}#{path}"
     end
@@ -116,7 +118,7 @@ module Conjoin
           send(method, options)
         else
           app.send(type).each do |asset|
-            options[path] = asset_path asset.gsub(/\.coffee/, '.js').gsub(/\.scss/, '.css')
+            options[path] = asset_path asset.gsub(/\.coffee/, '.js').gsub(/\.(scss|styl)/, '.css')
             send(method, options)
           end
         end
@@ -184,7 +186,9 @@ module Conjoin
 
         case ext
         when 'css'
-          new_ext = 'scss' if stylesheet_assets.include? file + '.scss'
+          %w(scss styl).each do |type|
+            new_ext = type if stylesheet_assets.include? file + ".#{type}"
+          end
         when 'js'
           new_ext = 'coffee' if javascript_assets.include? file + '.coffee' \
                              or javascript_head_assets.include? file + '.coffee'

data/lib/conjoin/form_builder.rb

@@ -11,7 +11,6 @@ module Conjoin
     def self.setup app
       require 'conjoin/mab'
 
-      app.use Rack::Csrf
       app.plugin Conjoin::Csrf
       # Dir["#{File.dirname(__FILE__)}/plugin/inputs/**/*.rb"].each  { |rb| require rb  }
       INPUTS.each do |input|

data/lib/conjoin/middleware.rb

@@ -16,6 +16,7 @@ module Conjoin
           # for ajax request over standard ones.
           # https://github.com/rkh/rack-protection/issues/11#issuecomment-9005539
           use Rack::Protection, except: :session_hijacking
+          use Rack::Csrf
 
           if not Conjoin.env.mounted? and Conjoin.env.development?
             require 'rack-livereload'

data/lib/conjoin/nav.rb

@@ -5,7 +5,7 @@ module Conjoin
     def self.setup app
       @settings = OpenStruct.new({
         navs: OpenStruct.new,
-        icon_class: 'ico',
+        icon_class: 'fa fa',
         active_class: 'active open'
       })
       require "#{app.root}/config/nav.rb"

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.21"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.24
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -136,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stylus
+  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: coffee-script
   requirement: !ruby/object:Gem::Requirement