compass-jquery-plugin 0.3.0.beta.25 → 0.3.0.beta.26

data/Rakefile

@@ -13,8 +13,8 @@ begin
     gem.homepage = "http://github.com/kosmas58/compass-jquery-plugin"
     gem.summary = "A compass plugin that integrates jRails, jQuery, jQuery UI and Themes, jqGrid and more into the Compass Sass framework."
     gem.description = gem.summary
-    gem.add_dependency("haml", [">= 3.0.4"])
-    gem.add_dependency("compass", [">= 0.10.1"])
+    gem.add_dependency("haml", [">= 3.0.23"])
+    gem.add_dependency("compass", [">= 0.10.6"])
     gem.add_dependency("ri_cal", [">= 0.8.7"])
     gem.files.exclude("src/**/")
   end

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
-:commit: beta.25
+:commit: beta.26
 :patch:  0
 :minor:  3
 :major:  0

data/compass-jquery-plugin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{compass-jquery-plugin}
-  s.version = "0.3.0.beta.25"
+  s.version = "0.3.0.beta.26"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kosmas Schuetz"]
@@ -41,9 +41,8 @@ Gem::Specification.new do |s|
      "lib/google-compiler-20100917.jar",
      "lib/handle_attributes.rb",
      "lib/handle_js_files.rb",
-     "lib/jquery.mobile.rb",
+     "lib/jqtouch_theme.rb",
      "lib/jquery.rb",
-     "lib/jquery.ui.rb",
      "lib/jquery/compass_plugin.rb",
      "lib/jquery/dynatree.rb",
      "lib/jquery/emulators.rb",
@@ -76,6 +75,8 @@ Gem::Specification.new do |s|
      "lib/jquery/secret_sauce/helpers/ui_grid_helper.rb",
      "lib/jquery/secret_sauce/model/find_for_grid.rb",
      "lib/jquery/tools.rb",
+     "lib/jquery_mobile_theme.rb",
+     "lib/jquery_ui_theme.rb",
      "lib/js.jar",
      "lib/jslint-check.js",
      "lib/jslint.js",
@@ -1447,17 +1448,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.4"])
-      s.add_runtime_dependency(%q<compass>, [">= 0.10.1"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.0.23"])
+      s.add_runtime_dependency(%q<compass>, [">= 0.10.6"])
       s.add_runtime_dependency(%q<ri_cal>, [">= 0.8.7"])
     else
-      s.add_dependency(%q<haml>, [">= 3.0.4"])
-      s.add_dependency(%q<compass>, [">= 0.10.1"])
+      s.add_dependency(%q<haml>, [">= 3.0.23"])
+      s.add_dependency(%q<compass>, [">= 0.10.6"])
       s.add_dependency(%q<ri_cal>, [">= 0.8.7"])
     end
   else
-    s.add_dependency(%q<haml>, [">= 3.0.4"])
-    s.add_dependency(%q<compass>, [">= 0.10.1"])
+    s.add_dependency(%q<haml>, [">= 3.0.23"])
+    s.add_dependency(%q<compass>, [">= 0.10.6"])
     s.add_dependency(%q<ri_cal>, [">= 0.8.7"])
   end
 end

data/gem_tasks/jqtouch.rake

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'lib/handle_js_files'
+require 'lib/jqtouch_theme'
 
 JQTOUCH_SRC = File.join(GEM_ROOT, 'src', 'jqtouch')
 JQTOUCH_SRC_STYLESHEETS = File.join(JQTOUCH_SRC, 'css')
@@ -11,9 +12,6 @@ JQTOUCH_DEST_STYLESHEETS = File.join(JQTOUCH_DEST_TEMPLATES, 'jquery', 'touch')
 JQTOUCH_DEST_THEMES = File.join(JQTOUCH_DEST_STYLESHEETS)
 JQTOUCH_DEST_IMAGES = File.join(JQTOUCH_DEST_STYLESHEETS)
 
-JQTOUCH_MESSAGE1 = "# Generated by compass-jquery-plugin/gem-tasks/jqtouch.rake\n# Install with: compass install jquery/jqtouch\n\n"
-JQTOUCH_MESSAGE2 = "// Generated by compass-jquery-plugin/gem-tasks/jqtouch.rake\n\n"
-
 all_scripts = [
   'js/jqtouch.js',
   'js/jqtouch.transitions.js',
@@ -80,7 +78,7 @@ namespace :build do
       manifest.print "javascript 'jquery.jqtouch.min.js'\n"
       
       # Stylesheets
-      FileUtils.mkdir_p(JQTOUCH_DEST_STYLESHEETS)
+      FileUtils.mkdir_p(JQTOUCH_DEST_STYLESHEETS)      
       
       open File.join(JQTOUCH_DEST_STYLESHEETS, 'jqtouch.scss'), 'w' do |f|
         sass = JQTOUCH_MESSAGE2 
@@ -146,24 +144,15 @@ namespace :build do
       # jQuery jQTouch Themes
 
       FileUtils.mkdir_p(JQTOUCH_DEST_THEMES)
-      
+      jqtouch = JqTouchTheme.new() 
+
       Dir.foreach JQTOUCH_SRC_THEMES do |theme|
         next if /^\./ =~ theme
-
-        # Convert the stylesheets      
-        Dir.foreach File.join(JQTOUCH_SRC_THEMES, "#{theme}") do |file|
-          next unless /\.css$/ =~ file
-          css = File.read File.join(JQTOUCH_SRC_THEMES, "#{theme}", file)
-          sass = ''
-          IO.popen("sass-convert -F css -T scss", 'r+') { |f| f.print(css); f.close_write; sass = f.read }
-          open File.join(JQTOUCH_DEST_THEMES, "#{theme}.scss"), 'w' do |f|
-            f.write JQTOUCH_MESSAGE2 + sass
-          end
-          manifest.print "stylesheet 'jquery/touch/#{theme}.scss'\n"
-        end
+        jqtouch.convert_theme(theme, File.join(JQTOUCH_SRC_THEMES, theme), File.join(JQTOUCH_DEST_THEMES))
+        manifest.print "stylesheet 'jquery/touch/#{theme}.scss'\n"
 
         # Copy the theme images directory
-        src_dir = File.join(JQTOUCH_SRC_THEMES, theme, 'images')
+        src_dir = File.join(JQTOUCH_SRC_THEMES, theme, 'img')
         dest_dir = File.join(JQTOUCH_DEST_IMAGES, "#{theme}")
         FileUtils.mkdir_p dest_dir
         

data/gem_tasks/jrails.rake

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'lib/handle_js_files'
-require 'lib/jquery.ui'
+require 'lib/jquery_ui_theme'
 
 # Compass generator for jrails 0.1+
 SRC = File.join(GEM_ROOT, 'src', 'jrails')

data/gem_tasks/mobile.rake

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'lib/handle_js_files'
-require 'lib/jquery.mobile'
+require 'lib/jquery_mobile_theme'
 
 MOBILE_SRC = File.join(GEM_ROOT, 'src', 'mobile')
 MOBILE_SRC_IMAGES = File.join(MOBILE_SRC, 'images')

data/lib/jqtouch_theme.rb

@@ -0,0 +1,26 @@
+JQTOUCH_MESSAGE1 = "# Generated by compass-jquery-plugin/gem-tasks/jqtouch.rake\n# Install with: compass install jquery/jqtouch\n\n"
+JQTOUCH_MESSAGE2 = "// Generated by compass-jquery-plugin/gem-tasks/jqtouch.rake\n\n"
+
+class JqTouchTheme
+
+  # Initialize with the base theme
+  def initialize
+    @theme_filename = "theme.css"
+  end
+
+  # Create a sass file of variables names and copy the images
+  def convert_theme(name, dir, stylesheets)
+    theme = File.read(File.join(dir, @theme_filename))
+    
+    # Fix stuff
+    theme.gsub!(/\;filter:Alpha/, "; filter: Alpha")
+    theme.gsub! /url\(img(.+?)\)/, "image_url(\"jquery/touch/#{name}\\1\")"
+    
+    # Convert the stylesheet
+    open File.join(JQTOUCH_DEST_THEMES, "#{name}.scss"), 'w' do |f|
+      sass = JQTOUCH_MESSAGE2
+      IO.popen("sass-convert -F css -T scss", 'r+') { |ff| ff.print(theme); ff.close_write; sass += ff.read }
+      f.print sass
+    end
+  end
+end

data/lib/{jquery.mobile.rb → jquery_mobile_theme.rb}

@@ -3,11 +3,6 @@ MOBILE_MESSAGE2 = "// Generated by compass-jquery-plugin/gem-tasks/mobile.rake\n
 
 class JqueryMobileTheme
 
-  VARIABLE_NAME_BASE = 'mobile_'
-  VARIABLE_MATCHER = /(\S*)\/\*\{(\w*)\}\*\//
-
-  attr_accessor :base_theme
-
   # Initialize with the base theme
   def initialize(base_theme_directory)
     @prefix = 'jquery.mobile'

data/templates/jqtouch/jquery/touch/apple.scss

@@ -134,17 +134,28 @@ body {
       a {
         -webkit-border-bottom-left-radius: 8px;
         -webkit-border-bottom-right-radius: 8px; } } }
-  ul li.arrow {
-    background-image: image_url("jquery/touch/apple/chevron.png");
-    background-position: right center;
-    background-repeat: no-repeat;
-    a {
-      padding: 12px 22px 12px 10px; } }
-  #plastic ul li.arrow, #metal ul li.arrow {
-    background-image: image_url("jquery/touch/apple/chevron.png");
-    background-position: right center;
-    background-repeat: no-repeat; }
-  ul li a, li.img a + a {
+  ul {
+    li.arrow {
+      background-image: image_url("jquery/touch/apple/chevron.png");
+      background-position: right center;
+      background-repeat: no-repeat;
+      a {
+        padding: 12px 22px 12px 10px; } }
+    &.plastic li.arrow, &.metal li.arrow {
+      background-image: image_url("jquery/touch/apple/chevron.png");
+      background-position: right center;
+      background-repeat: no-repeat; }
+    li a {
+      color: #000;
+      text-decoration: none;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      display: block;
+      padding: 12px 10px 12px 10px;
+      margin: -10px;
+      -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } }
+  li.img a + a {
     color: #000;
     text-decoration: none;
     text-overflow: ellipsis;
@@ -279,162 +290,160 @@ body {
         font-size: 16px;
         margin: 1px 0 0 0;
         padding: 2px 10px;
-        text-shadow: #636a6f 0 1px 0; } } }
-  .edgetoedge {
-    h4 {
-      color: #fff;
-      background: rgb(154, 159, 170) image_url("jquery/touch/apple/listGroup.png") top left repeat-x;
-      border-top: 1px solid rgb(165, 177, 186);
-      text-shadow: #666 0 1px 0;
-      margin: 0;
-      padding: 2px 10px; }
-    margin: 0;
-    padding: 0;
-    background-color: rgb(255, 255, 255); }
-  .metal {
+        text-shadow: #636a6f 0 1px 0; }
+      h4 {
+        color: #fff;
+        background: rgb(154, 159, 170) image_url("jquery/touch/apple/listGroup.png") top left repeat-x;
+        border-top: 1px solid rgb(165, 177, 186);
+        text-shadow: #666 0 1px 0;
+        margin: 0;
+        padding: 2px 10px; } } }
+  .edgetoedge, .metal {
     margin: 0;
     padding: 0;
     background-color: rgb(255, 255, 255); }
-  .edgetoedge ul, .metal ul, .plastic ul {
-    -webkit-border-radius: 0;
-    margin: 0;
-    border-left: 0;
-    border-right: 0;
-    border-top: 0; }
-  .metal ul {
-    border-top: 0;
-    border-bottom: 0;
-    background: rgb(180, 180, 180); }
-  .edgetoedge ul li {
-    &:first-child, &:last-child {
+  ul {
+    &.edgetoedge, &.metal, &.plastic {
       -webkit-border-radius: 0;
-      a {
-        -webkit-border-radius: 0; } } }
-  .metal ul li {
-    &:first-child a, &:last-child a {
-      -webkit-border-radius: 0; } }
-  .edgetoedge {
-    ul li small {
-      font-size: 16px;
-      line-height: 28px; }
-    li {
+      margin: 0;
+      border-left: 0;
+      border-right: 0;
+      border-top: 0; }
+    &.metal {
+      border-top: 0;
+      border-bottom: 0;
+      background: rgb(180, 180, 180); }
+    &.edgetoedge li {
+      &:first-child, &:last-child {
+        -webkit-border-radius: 0;
+        a {
+          -webkit-border-radius: 0; } } }
+    &.metal li {
+      &:first-child a, &:last-child a {
+        -webkit-border-radius: 0; } }
+    &.edgetoedge li {
+      small {
+        font-size: 16px;
+        line-height: 28px; }
       -webkit-border-radius: 0; } }
   .metal li {
     -webkit-border-radius: 0; }
-  .edgetoedge {
-    li em {
-      font-weight: normal;
-      font-style: normal; }
-    h4 + ul {
-      border-top: 1px solid rgb(152, 158, 164);
-      border-bottom: 1px solid rgb(113, 125, 133); } }
-  ul li {
-    small {
-      color: #369;
-      font: 17px "Helvetica Neue", Helvetica;
-      text-align: right;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      display: block;
-      width: 23%;
-      float: right;
-      padding: 3px 0px; }
-    &.arrow small {
-      padding: 0 15px; }
-    small.counter {
-      font-size: 17px !important;
-      line-height: 13px !important;
-      font-weight: bold;
-      background: rgb(154, 159, 170);
-      color: #fff;
-      -webkit-border-radius: 11px;
-      padding: 4px 10px 5px 10px;
-      display: inline !important;
-      width: auto;
-      margin-top: -22px; }
-    &.arrow small.counter {
-      margin-right: 15px; } }
+  ul {
+    &.edgetoedge {
+      li em {
+        font-weight: normal;
+        font-style: normal; }
+      h4 + ul {
+        border-top: 1px solid rgb(152, 158, 164);
+        border-bottom: 1px solid rgb(113, 125, 133); } }
+    li {
+      small {
+        color: #369;
+        font: 17px "Helvetica Neue", Helvetica;
+        text-align: right;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        display: block;
+        width: 23%;
+        float: right;
+        padding: 3px 0px; }
+      &.arrow small {
+        padding: 0 15px; }
+      small.counter {
+        font-size: 17px !important;
+        line-height: 13px !important;
+        font-weight: bold;
+        background: rgb(154, 159, 170);
+        color: #fff;
+        -webkit-border-radius: 11px;
+        padding: 4px 10px 5px 10px;
+        display: inline !important;
+        width: auto;
+        margin-top: -22px; }
+      &.arrow small.counter {
+        margin-right: 15px; } } }
   #plastic ul li.arrow, #metal ul li.arrow {
     background-image: image_url("jquery/touch/apple/chevron.png");
     background-position: right center;
     background-repeat: no-repeat; }
-  .edgetoedge ul, .metal ul, .plastic ul {
-    -webkit-border-radius: 0;
-    margin: 0;
-    border-left: 0;
-    border-right: 0;
-    border-top: 0; }
-  .metal ul li {
-    border-top: 1px solid rgb(238, 238, 238);
-    border-bottom: 1px solid rgb(156, 158, 165);
-    font-size: 26px;
-    text-shadow: #fff 0 1px 0;
-    a {
-      line-height: 26px;
+  ul {
+    &.edgetoedge, &.metal, &.plastic {
+      -webkit-border-radius: 0;
       margin: 0;
-      padding: 13px 0;
-      &:hover {
-        color: rgb(0, 0, 0); } }
-    &:hover small {
-      color: inherit; }
-    a em {
-      display: block;
-      font-size: 14px;
-      font-style: normal;
-      color: #444;
-      width: 50%;
-      line-height: 14px; }
-    small {
-      float: right;
-      position: relative;
-      margin-top: 10px;
-      font-weight: bold; }
-    &.arrow {
-      a small {
-        padding-right: 0;
-        line-height: 17px; }
-      background: image_url("jquery/touch/apple/chevron.png") right center no-repeat; } }
+      border-left: 0;
+      border-right: 0;
+      border-top: 0; }
+    &.metal li {
+      border-top: 1px solid rgb(238, 238, 238);
+      border-bottom: 1px solid rgb(156, 158, 165);
+      font-size: 26px;
+      text-shadow: #fff 0 1px 0;
+      a {
+        line-height: 26px;
+        margin: 0;
+        padding: 13px 0;
+        &:hover {
+          color: rgb(0, 0, 0); } }
+      &:hover small {
+        color: inherit; }
+      a em {
+        display: block;
+        font-size: 14px;
+        font-style: normal;
+        color: #444;
+        width: 50%;
+        line-height: 14px; }
+      small {
+        float: right;
+        position: relative;
+        margin-top: 10px;
+        font-weight: bold; }
+      &.arrow {
+        a small {
+          padding-right: 0;
+          line-height: 17px; }
+        background: image_url("jquery/touch/apple/chevron.png") right center no-repeat; } } }
   .plastic {
     margin: 0;
     padding: 0;
-    background: rgb(173, 173, 173);
-    ul {
+    background: rgb(173, 173, 173); }
+  ul.plastic {
+    -webkit-border-radius: 0;
+    margin: 0;
+    border-left: 0;
+    border-right: 0;
+    border-top: 0;
+    background-color: rgb(173, 173, 173);
+    li {
       -webkit-border-radius: 0;
-      margin: 0;
-      border-left: 0;
-      border-right: 0;
-      border-top: 0;
-      background-color: rgb(173, 173, 173);
-      li {
-        -webkit-border-radius: 0;
-        border-top: 1px solid rgb(191, 191, 191);
-        border-bottom: 1px solid rgb(157, 157, 157);
-        &:nth-child(odd) {
-          background-color: rgb(152, 152, 152);
-          border-top: 1px solid rgb(181, 181, 181);
-          border-bottom: 1px solid rgb(138, 138, 138); } }
-      + p {
-        font-size: 11px;
-        color: #2f3237;
-        text-shadow: none;
-        padding: 10px 10px;
-        strong {
-          font-size: 14px;
-          line-height: 18px;
-          text-shadow: #fff 0 1px 0; } }
-      li {
-        a {
-          text-shadow: rgb(211, 211, 211) 0 1px 0; }
-        &:nth-child(odd) a {
-          text-shadow: rgb(191, 191, 191) 0 1px 0; }
-        small {
-          color: #3C3C3C;
-          text-shadow: rgb(211, 211, 211) 0 1px 0;
-          font-size: 13px;
-          font-weight: bold;
-          text-transform: uppercase;
-          line-height: 24px; } } } }
+      border-top: 1px solid rgb(191, 191, 191);
+      border-bottom: 1px solid rgb(157, 157, 157);
+      &:nth-child(odd) {
+        background-color: rgb(152, 152, 152);
+        border-top: 1px solid rgb(181, 181, 181);
+        border-bottom: 1px solid rgb(138, 138, 138); } }
+    + p {
+      font-size: 11px;
+      color: #2f3237;
+      text-shadow: none;
+      padding: 10px 10px;
+      strong {
+        font-size: 14px;
+        line-height: 18px;
+        text-shadow: #fff 0 1px 0; } }
+    li {
+      a {
+        text-shadow: rgb(211, 211, 211) 0 1px 0; }
+      &:nth-child(odd) a {
+        text-shadow: rgb(191, 191, 191) 0 1px 0; }
+      small {
+        color: #3C3C3C;
+        text-shadow: rgb(211, 211, 211) 0 1px 0;
+        font-size: 13px;
+        font-weight: bold;
+        text-transform: uppercase;
+        line-height: 24px; } } }
   #plastic ul {
     &.minibanner {
       margin: 10px;

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: compass-jquery-plugin
 version: !ruby/object:Gem::Version 
-  hash: 62196385
+  hash: 62196391
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 25
-  version: 0.3.0.beta.25
+  - 26
+  version: 0.3.0.beta.26
 platform: ruby
 authors: 
 - Kosmas Schuetz
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 41
         segments: 
         - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 23
+        version: 3.0.23
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 59
         segments: 
         - 0
         - 10
-        - 1
-        version: 0.10.1
+        - 6
+        version: 0.10.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -102,9 +102,8 @@ files:
 - lib/google-compiler-20100917.jar
 - lib/handle_attributes.rb
 - lib/handle_js_files.rb
-- lib/jquery.mobile.rb
+- lib/jqtouch_theme.rb
 - lib/jquery.rb
-- lib/jquery.ui.rb
 - lib/jquery/compass_plugin.rb
 - lib/jquery/dynatree.rb
 - lib/jquery/emulators.rb
@@ -137,6 +136,8 @@ files:
 - lib/jquery/secret_sauce/helpers/ui_grid_helper.rb
 - lib/jquery/secret_sauce/model/find_for_grid.rb
 - lib/jquery/tools.rb
+- lib/jquery_mobile_theme.rb
+- lib/jquery_ui_theme.rb
 - lib/js.jar
 - lib/jslint-check.js
 - lib/jslint.js