revelry_core 0.1.11.5 → 0.1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1436f5abdfe1dd94158f9efb8f56f387e099490f
-  data.tar.gz: a6b9114acd1a17f1e44bd233a51299356092a796
+  metadata.gz: 476cd2e797261c998fc338414de3258fcc28e761
+  data.tar.gz: 5b17a1a4d71f4746113c07c32fe3240e67bce454
 SHA512:
-  metadata.gz: 2c20de27bedeafbc2dd39ccebbe34e99e6b07532dc275bc9d82cc57d6fd0c53c9861a312c13dc1e7f8e15d6c6d28b5ba674a355bedf4b5fce567cc566c198436
-  data.tar.gz: d2378d7c80e8218eda27620a1d126c0e091e29b05cd75853cc7b51efb15dc782cbea57295c1fe232619f2dc229ccad0f3611e77d311e9e83dc55fcce61b1548c
+  metadata.gz: 132447cdd18197798b538b63e40cae2eff15daab79c52cf9e52091a5b97be926f3c7e1f8bd65eee4762ee1d3135f3ca1d34e61dc00c07ab9ea10b762876e8b3c
+  data.tar.gz: 7a29e96712a1099137dfcdf763be10a860f0c6c820935262ff78d6122ef83bb80748a9a2afd53441cff2076dbf78a5f748f67bd59e3534b82afdaa78c976e3fc

data/Rakefile

@@ -25,3 +25,5 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+require 'tasks/standalone'

data/app/assets/javascripts/revelry/examples/Tabs.js.cjsx

@@ -1,6 +1,10 @@
-Rev.pullInto(this) 'Lipsum', 'StatelessTabs', 'Tabs', 'TabBlock', 'TabsAccordion'
+Rev.pullInto(this) 'Lipsum', 'TabBlock', 'TabsAccordion', 'Button', 'Panel'
+Rev.pullInto(this) 'StatelessTabs', 'Tabs', 'StatelessTabContent'
 
 Rev.registerExample 'Tabs & Such',
+  getInitialState: ->
+    state =
+      contentActiveKey: 'one'
 
   onTabChange: (e) ->
     alert "Changing active tab to key `#{e.activeTab.key}`"
@@ -21,6 +25,27 @@ Rev.registerExample 'Tabs & Such',
           <Lipsum p=2 />
         </TabBlock>
       </StatelessTabs>
+      <h3>{"<StatelessTabsContent>"}</h3>
+      <p>
+        StatelessTabsContent shows only the <em>content</em> from a tab area,
+        not the tabs themselves. It is useful for implementing components which
+        behave like tabbed areas, but do not have automatically associated tabs.
+      </p>
+      <Panel>
+        <StatelessTabContent activeKey={this.state.contentActiveKey}>
+          <TabBlock key="one" tab={<a href="#">One</a>}>
+            <Lipsum />
+          </TabBlock>
+          <TabBlock key="two" tab={<a href="#">Two</a>}>
+            <Lipsum p=2 />
+          </TabBlock>
+        </StatelessTabContent>
+        <div>
+          These buttons actually control the content area.
+          <Button onClick={=> this.setState contentActiveKey: 'one'}>One</Button>
+          <Button onClick={=> this.setState contentActiveKey: 'two'}>Two</Button>
+        </div>
+      </Panel>
       <h3>{"<Tabs>"}</h3>
       <Tabs onChange={@onTabChange}>
         <TabBlock key="one" tab={<a href="#">One</a>}>

data/app/assets/javascripts/revelry/router/routerlink.js.cjsx

@@ -31,7 +31,7 @@ Rev.registerComponent 'RouterLink',
   # call to `Backbone.history.navigate` wants the slash? Trim it for matching
   # only.
   bbNormalHref: ->
-    if @props.href[0] == '/' then @props.href[1..] else @props.href end
+    if @props.href[0] == '/' then @props.href[1..] else @props.href
 
   hasMatch: ->
     if @props.href?

data/app/assets/javascripts/revelry/ui/formatting/Currency.js.cjsx.orig

@@ -0,0 +1,30 @@
+Rev.pullInto(this) 'NumberFormatter'
+Rev.registerComponent 'Currency',
+  propTypes: ->
+    value: React.PropTypes.number
+    locales: React.PropTypes.string
+    localeMatcher: React.PropTypes.oneOf ['lookup', 'best fit']
+    style: React.PropTypes.oneOf ['decimal', 'currency', 'percent']
+    currency: React.PropTypes.string
+    currencyDisplay: React.PropTypes.oneOf ['symbol', 'code', 'name']
+    useGrouping: React.PropTypes.bool
+    minimumIntegerDigits: React.PropTypes.number
+    minimumFractionDigits: React.PropTypes.number
+    maximumFractionDigits: React.PropTypes.number
+    minimumSignificantDigits: React.PropTypes.number
+    maximumSignificantDigits: React.PropTypes.number
+
+  render: ->
+    <span className="RevCurrency #{@props.className or ''}">
+<<<<<<< HEAD
+      <NumberFormatter
+        currency='USD'
+        style='currency'
+        maximumFractionDigits=2
+        {...@props}
+        className={@props.className}
+      />
+=======
+      <Rev.Components.NumberFormatter currency='USD' style='currency' {...@props} className={@props.className} />
+>>>>>>> 5d2a119a1c37e74f69c829e03c8974d66bc0e65f
+    </span>

data/app/assets/javascripts/revelry/ui/tabs/Tabs.js.cjsx

@@ -1,3 +1,18 @@
+Rev.registerComponent 'StatelessTabContent',
+  propTypes:
+    activeKey: React.PropTypes.string.isRequired
+    children: React.PropTypes.node.isRequired
+
+  renderContent: (child) ->
+    newProps = key: child.key
+    newProps.active = true if child.key == this.props.activeKey
+    React.cloneElement child, newProps
+
+  render: ->
+    <div className="RevTabs-content tabs-content">
+      {@getNormalizedChildren().map @renderContent}
+    </div>
+
 Rev.registerComponent 'StatelessTabs',
 
   getDefaultProps: ->
@@ -21,8 +36,6 @@ Rev.registerComponent 'StatelessTabs',
     React.cloneElement child, newProps
 
   render: ->
-    children = @getNormalizedChildren()
-
     dlClassName = @classSet
       'RevTabs-tabs': true
       tabs: true
@@ -30,11 +43,11 @@ Rev.registerComponent 'StatelessTabs',
 
     <div className='RevTabs'>
       <dl className={dlClassName}>
-        {children.map @renderTab}
+        {@getNormalizedChildren().map @renderTab}
       </dl>
-      <div className="RevTabs-content tabs-content">
-        {children.map @renderContent}
-      </div>
+      <Rev.Components.StatelessTabContent {...@props} activeKey={@getActiveKey()}>
+        {@props.children}
+      </Rev.Components.StatelessTabContent>
     </div>
 
   handleTabClick: (activeTab) -> (e) =>

data/lib/revelry_core/version.rb

@@ -1,5 +1,5 @@
 module Revelry
   module Core
-    VERSION = "0.1.11.5"
+    VERSION = "0.1.11.6"
   end
 end

data/lib/revelry_core/version.rb.orig

@@ -0,0 +1,9 @@
+module Revelry
+  module Core
+<<<<<<< HEAD
+    VERSION = "0.1.9.0"
+=======
+    VERSION = "0.1.8.6"
+>>>>>>> 5a93d42e0d9deef4b23b91139f3dec4934bebb5b
+  end
+end

data/lib/tasks/standalone.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'bundler'
+require 'pathname'
+require 'logger'
+require 'fileutils'
+
+Bundler.require
+
+ROOT        = Rails.root
+LOGGER      = Logger.new(STDOUT)
+BUNDLES     = %w( revelry/client.js revelry.css )
+BUILD_DIR   = ROOT.join("../../build")
+SOURCE_DIR  = ROOT.join("app", "assets")
+
+task :standalone => :environment do
+  BUNDLES.each do |bundle|
+    assets = Rails.application.assets.find_asset(bundle)
+    prefix, basename = assets.pathname.to_s.split('/')[-2..-1]
+    FileUtils.mkpath BUILD_DIR.join(prefix)
+
+    assets.write_to(BUILD_DIR.join(prefix, basename))
+  end
+end