lalala 4.1.0.dev.305 → 4.1.0.dev.309

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d329a4a1b854f2fbc863f36e6836c8024612fa
-  data.tar.gz: fc2864e92a0e8c8120decfd8d5d4aacd0f5e2289
+  metadata.gz: 5d854c908da3c69b8ab328a4e4e059a8d5a42422
+  data.tar.gz: 9988d780177b088e0cfc30c5ac4f7e74cc22f29c
 SHA512:
-  metadata.gz: a02aa6edd51dee002d5d2ec2bea3c776346f4d1944429646f3d23ef8a7cd67bf3088c01e3f731a04e064d9d095332c51e855c68cfd618ec5355b0b06d759a3c3
-  data.tar.gz: e959c755eef717dc4f227d0b7c94ee585111e5d977b012aee85d864b503c7e640655179feddaef226dab28f836d25cd030f862dc165d7ea296385952ff224e33
+  metadata.gz: 05ad5cb9f8daf46eafaa41e938f8c6ea0d6799c95a7e6db007e19852bd719139d5b07c3b3b7e4c44409779006a96079ff2a3c7bcc07d01b7b3e95c9fea6556b2
+  data.tar.gz: 807490aba98de0452f6bf9f5215c675279b819c81f142fad5f8516495e498d1616ae0c0c6ee890144cb0e46f0454397c51ed6e5a435b8ba0a7c9f1b000f4afd2

data/lib/formtastic/inputs/multiple_files_input.rb

@@ -9,11 +9,10 @@ class Formtastic::Inputs::MultipleFilesInput
     title = method.to_s.pluralize.titleize
     assets = object.send(method)
 
-    profile_name = object.class.haraway_assets[method.to_s]
-    profile = Haraway.configuration.profiles[profile_name]
-    accepts = profile.try(:accepted_file_types)
+    defn = object.class.haraway_assets[method.to_s]
+    accepts = defn.profile.try(:accepted_file_types)
     accepts = accepts.join(", ") if accepts
-    versions = compile_versions_array(profile)
+    versions = compile_versions_array(defn.profile)
 
     sorted_assets = klass.sorted_assets(assets.clone).map do |asset|
       klass.xfile_html(self, template, param_key, asset, versions)
@@ -21,7 +20,7 @@ class Formtastic::Inputs::MultipleFilesInput
 
     <<-HTML
 
-    <x-files multiple-files profile="#{profile_name}" accept="#{accepts}" name="#{param_key}">
+    <x-files multiple-files profile="#{defn.profile.name}" accept="#{accepts}" name="#{param_key}">
       <header>
         <div class="col-a">
           <span class="name">#{title}</span>
@@ -54,7 +53,7 @@ class Formtastic::Inputs::MultipleFilesInput
       </div>
 
       <div class="meta-versions">
-        #{ versions_html(profile) }
+        #{ versions_html(defn.profile) }
       </div>
     </x-files>
 

data/lib/formtastic/inputs/single_file_input.rb

@@ -7,15 +7,14 @@ class Formtastic::Inputs::SingleFileInput
     title = method.to_s.titleize
     asset = object.send(method)
 
-    profile_name = object.class.haraway_assets[method.to_s]
-    profile = Haraway.configuration.profiles[profile_name]
-    accepts = profile.try(:accepted_file_types)
+    defn = object.class.haraway_assets[method.to_s]
+    accepts = defn.profile.try(:accepted_file_types)
     accepts = accepts.join(", ") if accepts
-    versions = compile_versions_array(profile)
+    versions = compile_versions_array(defn.profile)
 
     <<-HTML
 
-    <x-files single-file profile="#{profile_name}" accept="#{accepts}" name="#{param_key}">
+    <x-files single-file profile="#{defn.profile.name}" accept="#{accepts}" name="#{param_key}">
       <div class="association">#{ title }</div>
 
       <div class="buttons">

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "305"
+  BUILD   = "309"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.305
+  version: 4.1.0.dev.309
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin