conjoin 0.0.14 → 0.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/conjoin/auth.rb +1 -1
  3. data/lib/conjoin/form_builder.rb +1 -1
  4. data/lib/conjoin/inputs/text.rb +15 -0
  5. data/lib/conjoin/ui.rb +2 -0
  6. data/lib/conjoin/version.rb +1 -1
  7. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bea11d6dd2b7bd3ff388bcd4660848af9f336121
4
- data.tar.gz: 2f89a2437b24339ec9531963664abcb5e6695b11
3
+ metadata.gz: 47cfd51ef07f9a4fd6a0d3d9dff7403e959ab911
4
+ data.tar.gz: 63a7eedce4dc865c9bdb27000d7074915bec4fbd
5
5
  SHA512:
6
- metadata.gz: 37a7cfcaf55b441eed330028e51354ebeab65edab9f8c4dffbcc65009c688ab3a3cb56dcbb1972066379ed6f6c93f6f43e4d74a9e6b25be2c35a26a2d3bc7034
7
- data.tar.gz: b3499636bfe7b1a4da814e902594c858fe4f2e660d5757cb624e98863d5a0859ea6204507057fd066b97cdcd88bcc8f425bed32c8e9c070d6f2150ab315e2751
6
+ metadata.gz: b7b4d45721c17c320ed75057930ee37b4bb7927052d2d2686b6601a9f2e978d89e8f788aa9a64681cb72eca5e6e6b4274077da54acbe367e3ef1b5ea7efd1ab6
7
+ data.tar.gz: ebee6fa74b49d3961a076501a214aedf3ea78e754315c8e76cc6b9be8725f57c5f993f1893842cca8dbb5509da897d69a64f897aef4a2c3b1ee83bc7b1eeb6e6
data/lib/conjoin/auth.rb CHANGED
@@ -30,7 +30,7 @@ module Conjoin
30
30
 
31
31
  def current_user
32
32
  if not Conjoin.env.mounted?
33
- authenticated(Subro::Models::User)
33
+ authenticated(Subrolink::Models::User)
34
34
  else
35
35
  req.env['warden'].authenticate(scope: :user)
36
36
  end
data/lib/conjoin/form_builder.rb CHANGED
@@ -5,7 +5,7 @@ module Conjoin
5
5
  INPUTS = [
6
6
  :boolean , :checkbox , :date , :decimal , :file , :hidden ,
7
7
  :integer , :password , :radio , :select , :state , :string ,
8
- :display , :datetime , :time , :year
8
+ :display , :datetime , :time , :year , :text
9
9
  ]
10
10
 
11
11
  def self.setup app
data/lib/conjoin/inputs/text.rb ADDED
@@ -0,0 +1,15 @@
1
+ module Conjoin
2
+ module FormBuilder
3
+ class TextInput < Input
4
+ def display
5
+ options[:class] += ' form-control'
6
+ value = options.delete :value
7
+ mab do
8
+ textarea options do
9
+ text value
10
+ end
11
+ end
12
+ end
13
+ end
14
+ end
15
+ end
data/lib/conjoin/ui.rb CHANGED
@@ -3,6 +3,8 @@ module Conjoin
3
3
  def panel options = {}, &block
4
4
  helper = self
5
5
 
6
+ options[:header] = options.delete :title if options.key? :title
7
+
6
8
  mab do
7
9
  div class: 'panel panel-default', id: options[:id] do
8
10
  if options.key? :header
data/lib/conjoin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Conjoin
2
- VERSION = "0.0.14"
2
+ VERSION = "0.0.15"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjoin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - cj
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-19 00:00:00.000000000 Z
11
+ date: 2014-04-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cuba
@@ -342,6 +342,7 @@ files:
342
342
  - lib/conjoin/inputs/select.rb
343
343
  - lib/conjoin/inputs/state.rb
344
344
  - lib/conjoin/inputs/string.rb
345
+ - lib/conjoin/inputs/text.rb
345
346
  - lib/conjoin/inputs/time.rb
346
347
  - lib/conjoin/inputs/year.rb
347
348
  - lib/conjoin/jquery.rb