semantic-ui-rails 0.1.0 → 0.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef14f24bab304510a353adf91ae0644cc05106c
-  data.tar.gz: 935897b528a029ed51b0136a942a8e02cd8a62ee
+  metadata.gz: a0619645542d53d7ba86017cab7686914e76be7e
+  data.tar.gz: cca97df6f90407c2f82b1a3de07b61dcd38b00e2
 SHA512:
-  metadata.gz: 132580d4160e6ec3be65869ba7f26dce9a7307cb81e83ff78110652360d4c8acbd3ae99fcc71378b5de41b99848507561115482a054eb3bd115821d547f1df78
-  data.tar.gz: c53bb48b57cc09700d112759a47acb04964cdf58175e13addc7ab51bfb1334e94b34baaa4bcd53e2c4a82e50f34aa5d9fa76485cac99daeb5fc9aadfbc07cce7
+  metadata.gz: 38ac19ed870bb42c50f8920bc0d0c1fd4dfa511b713cb901eb5aa4299098e364eac49cca77943ba2e60d5deb8fcabc5aa15ffe14c96548d8dd86a658adba11eb
+  data.tar.gz: e6e66609ddb156137c428887bce32a33e02178cdcbe99805949e521438ebffed20f4fc5a10532dd0f04219b2b6c7a91b0c571512fd24073198b26afd8464fff3

data/lib/generators/semantic/install/install_generator.rb

@@ -20,15 +20,15 @@ module Semantic
         end
 
         # copy less manifests
-        css_manifests = 'app/assets/stylesheets/semantic-ui'
+        css_manifests = 'app/assets/stylesheets/semantic-ui.css.less'
 
-        if File.directory?(css_manifests)
+        if File.exist?(css_manifests)
           puts <<-EOM
           Notice:
             #{css_manifests} exist; skipping
           EOM
         else
-          directory "semantic-ui", css_manifests, :recursive => true
+          copy_file "semantic-ui", "app/assets/stylesheets/semantic-ui.css.less"
         end
 
       end

data/lib/generators/semantic/install/templates/semantic-ui.css.less

@@ -0,0 +1,47 @@
+/* Elements */ 
+@import 'semantic-ui/elements/header.less'; 
+@import 'semantic-ui/elements/progress.less'; 
+@import 'semantic-ui/elements/segment.less'; 
+@import 'semantic-ui/elements/loader.less'; 
+@import 'semantic-ui/elements/step.less'; 
+@import 'semantic-ui/elements/button.less'; 
+@import 'semantic-ui/elements/input.less'; 
+@import 'semantic-ui/elements/label.less'; 
+@import 'semantic-ui/elements/divider.less'; 
+@import 'semantic-ui/elements/image.less'; 
+@import 'semantic-ui/elements/basic.icon.less'; 
+@import 'semantic-ui/elements/icon.less'; 
+
+/* Collections */ 
+@import 'semantic-ui/collections/table.less'; 
+@import 'semantic-ui/collections/breadcrumb.less'; 
+@import 'semantic-ui/collections/message.less'; 
+@import 'semantic-ui/collections/grid.less'; 
+@import 'semantic-ui/collections/menu.less'; 
+@import 'semantic-ui/collections/form.less'; 
+
+/* Views */ 
+@import 'semantic-ui/views/list.less'; 
+@import 'semantic-ui/views/comment.less'; 
+@import 'semantic-ui/views/item.less'; 
+@import 'semantic-ui/views/statistic.less'; 
+@import 'semantic-ui/views/feed.less'; 
+
+/* Modules */ 
+@import 'semantic-ui/modules/popup.less'; 
+@import 'semantic-ui/modules/dimmer.less'; 
+@import 'semantic-ui/modules/rating.less'; 
+@import 'semantic-ui/modules/accordion.less'; 
+@import 'semantic-ui/modules/transition.less'; 
+@import 'semantic-ui/modules/checkbox.less'; 
+@import 'semantic-ui/modules/search.less'; 
+@import 'semantic-ui/modules/video.less'; 
+@import 'semantic-ui/modules/nag.less'; 
+@import 'semantic-ui/modules/shape.less'; 
+@import 'semantic-ui/modules/modal.less'; 
+@import 'semantic-ui/modules/sidebar.less'; 
+@import 'semantic-ui/modules/reveal.less'; 
+@import 'semantic-ui/modules/tab.less'; 
+@import 'semantic-ui/modules/dropdown.less'; 
+@import 'semantic-ui/modules/chatroom.less'; 
+

data/lib/semantic/ui/rails/version.rb

@@ -1,7 +1,7 @@
 module Semantic
   module Ui
     module Rails
-      VERSION = "0.1.0"
+      VERSION = "0.1.0.1"
     end
   end
 end

data/semantic.thor

@@ -24,8 +24,7 @@ class Semantic < Thor
 
     parse_version
     copy_files
-    fix_fonts_paths
-    fix_images_paths
+    fix_paths
     generate_templates
   end
 
@@ -39,9 +38,13 @@ class Semantic < Thor
     end
 
     def pull
-      say_status "STEP", "PULL REPO"
-      git = Git.open(git_root, :log => Logger.new(STDOUT))
-      git.pull
+      begin
+        say_status "STEP", "PULL REPO"
+        git = Git.open(git_root, :log => Logger.new(STDOUT))
+        git.pull
+      rescue
+        puts "no internet connection"
+      end
     end
 
     def parse_version
@@ -56,13 +59,10 @@ class Semantic < Thor
       gsub_file version_file, /(?<=VERSION = \")(.+)(?=\")/, version
     end
 
-    def fix_fonts_paths
-      gsub_file source_root + 'vendor/assets/stylesheets/semantic-ui/elements/icon.less', /(?<=url\()(.+\/fonts)(?=\/)/, '/assets/semantic-ui'
-      gsub_file source_root + 'vendor/assets/stylesheets/semantic-ui/elements/basic.icon.less', /(?<=url\()(.+\/fonts)(?=\/)/, '/assets/semantic-ui'
-    end
-
-    def fix_images_paths
-      # TODO: do it
+    def fix_paths
+      Dir.glob(source_root + "vendor" + "**/*.less") do |file|
+        gsub_file file, /(?<=url\()(.+\/\w+)(?=\/)/, '/assets/semantic-ui'
+      end
     end
 
     def copy_files
@@ -107,26 +107,30 @@ class Semantic < Thor
       end
 
       # STYLESHEETS
-      say_status "STEP", "GENERATE STYLESHEETS TEMPLATES"
-      css_template_path = source_root + "lib/generators/semantic/install/templates/semantic-ui/"
+      say_status "STEP", "GENERATE STYLESHEETS TEMPLATE"
+      css_template_path = source_root + "lib/generators/semantic/install/templates/semantic-ui.css.less"
 
-      stylesheets_path = Pathname.new(source_root + "vendor/assets/stylesheets/semantic-ui")
+      stylesheets = Pathname.new(source_root + "vendor/assets/stylesheets/semantic-ui")
 
-      FileUtils.rm_rf Dir.glob css_template_path + "*.*"
+      FileUtils.rm css_template_path
 
-      Dir.glob stylesheets_path + "**/*" do |file|
-        if File.directory? file
-          File.open(css_template_path + (Pathname.new(file).basename.to_s + ".less"), 'a') do |template|
-            Dir.glob(stylesheets_path + file + "**/*") do |file|
-              next if File.directory? file
+      dirs_order = %w(elements collections views modules)
 
-              filepath = Pathname.new(file)
+      File.open(css_template_path, 'a') do |template|
+        dirs_order.each do |dir|
+          template.write "/* #{dir.capitalize} */ \n"
 
-              relative_path = filepath.relative_path_from(stylesheets_path)
+          Dir.glob(source_root + stylesheets + dir + "**/*") do |file|
+            next if File.directory? file
 
-              template.write "@import 'semantic-ui/#{relative_path}'; \n"
-            end
+            filepath = Pathname.new(file)
+
+            relative_path = filepath.relative_path_from(stylesheets)
+
+            template.write "@import 'semantic-ui/#{relative_path}'; \n"
           end
+
+          template.write "\n"
         end
       end
     end

data/vendor/assets/javascripts/semantic-ui/modules/accordion.js

@@ -87,8 +87,10 @@ $.fn.accordion = function(parameters) {
           resetStyle: function() {
             module.verbose('Resetting styles on element', this);
             $(this)
+              .attr('style', '')
               .removeAttr('style')
               .children()
+                .attr('style', '')
                 .removeAttr('style')
             ;
           }
@@ -138,8 +140,10 @@ $.fn.accordion = function(parameters) {
                 .slideUp(settings.duration , settings.easing, function() {
                   $previousContent
                     .removeClass(className.active)
+                    .attr('style', '')
                     .removeAttr('style')
                     .children()
+                      .attr('style', '')
                       .removeAttr('style')
                   ;
                 })
@@ -151,11 +155,13 @@ $.fn.accordion = function(parameters) {
             $activeContent
               .stop()
               .children()
+                .attr('style', '')
                 .removeAttr('style')
                 .end()
               .slideDown(settings.duration, settings.easing, function() {
                 $activeContent
                   .addClass(className.active)
+                  .attr('style', '')
                   .removeAttr('style')
                 ;
                 $.proxy(settings.onOpen, $activeContent)();
@@ -185,6 +191,7 @@ $.fn.accordion = function(parameters) {
               .end()
             .slideUp(settings.duration, settings.easing, function(){
               $activeContent
+                .attr('style', '')
                 .removeAttr('style')
               ;
               $.proxy(settings.onClose, $activeContent)();

data/vendor/assets/javascripts/semantic-ui/modules/chatroom.js

@@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) {
       if(instance === undefined) {
         module.initialize();
       }
-      invokedResponse = module.invoke(query);
+      module.invoke(query);
     }
     else {
       if(instance !== undefined) {

data/vendor/assets/javascripts/semantic-ui/modules/checkbox.js

@@ -104,7 +104,7 @@ $.fn.checkbox = function(parameters) {
         },
 
         enable: function() {
-          module.debug('Enabling checkbox');
+          module.debug('Enabling checkbox', $input);
           $input
             .prop('checked', true)
           ;
@@ -218,9 +218,6 @@ $.fn.checkbox = function(parameters) {
             if(moduleSelector) {
               title += ' \'' + moduleSelector + '\'';
             }
-            if($allModules.size() > 1) {
-              title += ' ' + '(' + $allModules.size() + ')';
-            }
             if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
               console.groupCollapsed(title);
               if(console.table) {
@@ -334,7 +331,7 @@ $.fn.checkbox.settings = {
   },
 
   selector : {
-    input  : 'input',
+    input  : 'input[type=checkbox], input[type=radio]',
     label  : 'label'
   },
 

data/vendor/assets/javascripts/semantic-ui/modules/dimmer.js

@@ -44,46 +44,56 @@ $.fn.dimmer = function(parameters) {
   $allModules
     .each(function() {
       var
-        $module      = $(this),
-        $dimmer      = $module.children(selector.dimmer).first(),
+        $module = $(this),
+        $dimmer,
+        $dimmable,
 
-        element      = this,
-        instance     = $dimmer.data(moduleNamespace),
+        element   = this,
+        instance  = $module.data(moduleNamespace),
         module
       ;
 
-      module      = {
+      module = {
 
-        initialize: function() {
+        preinitialize: function() {
           if( module.is.dimmer() ) {
-            $dimmer = $module;
-            $module = $dimmer.parent();
-            module.debug('Module initialized as dimmer', settings);
+            $dimmable = $module.parent();
+            $dimmer   = $module;
           }
           else {
+            $dimmable = $module;
             if( module.has.dimmer() ) {
-              $dimmer = $module.children(selector.dimmer).first();
-              module.debug('Module initialized with found dimmer', settings);
+              $dimmer = $dimmable.children(selector.dimmer).first();
             }
             else {
               module.create();
-              module.debug('Module initialized with created dimmer', settings);
-            }
-            if(settings.on == 'hover') {
-              $module
-                .on('mouseenter' + eventNamespace, module.show)
-                .on('mouseleave' + eventNamespace, module.hide)
-              ;
-            }
-            else if(settings.on == 'click') {
-              $module
-                .on(clickEvent + eventNamespace, module.toggle)
-              ;
             }
           }
+        },
+
+        initialize: function() {
+          module.debug('Initializing dimmer', settings);
+          if(settings.on == 'hover') {
+            $dimmable
+              .on('mouseenter' + eventNamespace, module.show)
+              .on('mouseleave' + eventNamespace, module.hide)
+            ;
+          }
+          else if(settings.on == 'click') {
+            $dimmable
+              .on(clickEvent + eventNamespace, module.toggle)
+            ;
+          }
+
+          if( module.is.page() ) {
+            module.debug('Setting as a page dimmer', $dimmable);
+            module.set.pageDimmer();
+          }
+
           if(settings.closable) {
+            module.verbose('Adding dimmer close event', $dimmer);
             $dimmer
-              .on(clickEvent, module.event.click)
+              .on(clickEvent + eventNamespace, module.event.click)
             ;
           }
           module.set.dimmable();
@@ -91,16 +101,19 @@ $.fn.dimmer = function(parameters) {
         },
 
         instantiate: function() {
-          module.verbose('Storing instance of module');
+          module.verbose('Storing instance of module', module);
           instance = module;
-          $dimmer
+          $module
             .data(moduleNamespace, instance)
           ;
         },
 
         destroy: function() {
-          module.verbose('Destroying previous module');
-          $module
+          module.verbose('Destroying previous module', $dimmer);
+          $dimmable
+            .off(eventNamespace)
+          ;
+          $dimmer
             .off(eventNamespace)
           ;
         },
@@ -117,16 +130,21 @@ $.fn.dimmer = function(parameters) {
 
         },
 
-        create: function() {
-          $dimmer = settings.template.dimmer();
-          $dimmer
-            .appendTo($module)
+        addContent: function(element) {
+          var
+            $content = $(element).detach()
           ;
-          if(module.is.page()) {
-            module.set.pageDimmer();
+          module.debug('Add content to dimmer', $content);
+          if($content.parent()[0] !== $dimmer[0]) {
+            $dimmer.append($content);
           }
         },
 
+        create: function() {
+          $dimmer = $( settings.template.dimmer() );
+          return $dimmer.appendTo($dimmable);
+        },
+
         animate: {
           show: function(callback) {
             callback = callback || function(){};
@@ -182,6 +200,12 @@ $.fn.dimmer = function(parameters) {
           }
         },
 
+        get: {
+          dimmer: function() {
+            return $dimmer;
+          }
+        },
+
         has: {
           dimmer: function() {
             return ( $module.children(selector.dimmer).size() > 0 );
@@ -189,26 +213,26 @@ $.fn.dimmer = function(parameters) {
         },
 
         is: {
+          dimmer: function() {
+            return $module.is(selector.dimmer);
+          },
+          dimmable: function() {
+            return $module.is(selector.dimmable);
+          },
           active: function() {
             return $dimmer.hasClass(className.active);
           },
           animating: function() {
             return ( $dimmer.is(':animated') || $dimmer.hasClass(className.transition) );
           },
-          dimmer: function() {
-            return $module.is(selector.dimmer);
-          },
           page: function () {
-            return $module.is('body');
-          },
-          dimmable: function() {
-            return $module.is(selector.dimmable);
+            return $dimmable.is('body');
           },
           enabled: function() {
-            return !$module.hasClass(className.disabled);
+            return !$dimmable.hasClass(className.disabled);
           },
           disabled: function() {
-            return $module.hasClass(className.disabled);
+            return $dimmable.hasClass(className.disabled);
           },
           pageDimmer: function() {
             return $dimmer.hasClass(className.pageDimmer);
@@ -229,12 +253,10 @@ $.fn.dimmer = function(parameters) {
             ;
           },
           dimmable: function() {
-            $module
-              .addClass(className.dimmable)
-            ;
+            $dimmable.addClass(className.dimmable);
           },
           dimmed: function() {
-            $module.addClass(className.dimmed);
+            $dimmable.addClass(className.dimmed);
           },
           pageDimmer: function() {
             $dimmer.addClass(className.pageDimmer);
@@ -252,7 +274,7 @@ $.fn.dimmer = function(parameters) {
             ;
           },
           dimmed: function() {
-            $module.removeClass(className.dimmed);
+            $dimmable.removeClass(className.dimmed);
           },
           disabled: function() {
             $dimmer.removeClass(className.disabled);
@@ -260,7 +282,7 @@ $.fn.dimmer = function(parameters) {
         },
 
         show: function(callback) {
-          module.debug('Showing dimmer', $dimmer);
+          module.debug('Showing dimmer', $dimmer, settings);
           if( !(module.is.active() || module.is.animating() ) && module.is.enabled() ) {
             module.animate.show(callback);
             $.proxy(settings.onShow, element)();
@@ -454,6 +476,8 @@ $.fn.dimmer = function(parameters) {
         }
       };
 
+      module.preinitialize();
+
       if(methodInvoked) {
         if(instance === undefined) {
           module.initialize();