conjoin 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea11d6dd2b7bd3ff388bcd4660848af9f336121
-  data.tar.gz: 2f89a2437b24339ec9531963664abcb5e6695b11
+  metadata.gz: 47cfd51ef07f9a4fd6a0d3d9dff7403e959ab911
+  data.tar.gz: 63a7eedce4dc865c9bdb27000d7074915bec4fbd
 SHA512:
-  metadata.gz: 37a7cfcaf55b441eed330028e51354ebeab65edab9f8c4dffbcc65009c688ab3a3cb56dcbb1972066379ed6f6c93f6f43e4d74a9e6b25be2c35a26a2d3bc7034
-  data.tar.gz: b3499636bfe7b1a4da814e902594c858fe4f2e660d5757cb624e98863d5a0859ea6204507057fd066b97cdcd88bcc8f425bed32c8e9c070d6f2150ab315e2751
+  metadata.gz: b7b4d45721c17c320ed75057930ee37b4bb7927052d2d2686b6601a9f2e978d89e8f788aa9a64681cb72eca5e6e6b4274077da54acbe367e3ef1b5ea7efd1ab6
+  data.tar.gz: ebee6fa74b49d3961a076501a214aedf3ea78e754315c8e76cc6b9be8725f57c5f993f1893842cca8dbb5509da897d69a64f897aef4a2c3b1ee83bc7b1eeb6e6

data/lib/conjoin/auth.rb

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

data/lib/conjoin/form_builder.rb

@@ -5,7 +5,7 @@ module Conjoin
     INPUTS = [
       :boolean , :checkbox , :date  , :decimal , :file  , :hidden ,
       :integer , :password , :radio , :select  , :state , :string ,
-      :display , :datetime , :time  , :year
+      :display , :datetime , :time  , :year    , :text
     ]
 
     def self.setup app

data/lib/conjoin/inputs/text.rb

@@ -0,0 +1,15 @@
+module Conjoin
+  module FormBuilder
+    class TextInput < Input
+      def display
+        options[:class] += ' form-control'
+        value = options.delete :value
+        mab do
+          textarea options do
+            text value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/conjoin/ui.rb

@@ -3,6 +3,8 @@ module Conjoin
     def panel options = {}, &block
       helper = self
 
+      options[:header] = options.delete :title if options.key? :title
+
       mab do
         div class: 'panel panel-default', id: options[:id] do
           if options.key? :header

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -342,6 +342,7 @@ files:
 - lib/conjoin/inputs/select.rb
 - lib/conjoin/inputs/state.rb
 - lib/conjoin/inputs/string.rb
+- lib/conjoin/inputs/text.rb
 - lib/conjoin/inputs/time.rb
 - lib/conjoin/inputs/year.rb
 - lib/conjoin/jquery.rb